diff --git a/minigui.d b/minigui.d
index a143b6a..bd4c4f2 100644
--- a/minigui.d
+++ b/minigui.d
@@ -2193,6 +2193,8 @@ class TextEdit : Widget {
 			auto l = GetWindowTextA(hwnd, buffer.ptr, buffer.length - 1);
 			if(l >= 0)
 				return buffer[0 .. l].idup;
+			else
+				return null;
 		} else {
 			return textLayout.getPlainText();
 		}
diff --git a/simpledisplay.d b/simpledisplay.d
index 02948f4..986a33d 100644
--- a/simpledisplay.d
+++ b/simpledisplay.d
@@ -3559,7 +3559,7 @@ version(Windows) {
 			}
 
 			// hide cursor in client area if necessary
-			if (curHidden > 0 && msg == WM_SETCURSOR && cast(ushort)lParam == HTCLIENT) {
+			if (wind.curHidden > 0 && msg == WM_SETCURSOR && cast(ushort)lParam == 1/*HTCLIENT*/) {
 				SetCursor(null);
 				return 1;
 			}