diff --git a/desktop/gui.cpp b/desktop/gui.cpp
index 7336523..5a200d4 100644
--- a/desktop/gui.cpp
+++ b/desktop/gui.cpp
@@ -7814,8 +7814,8 @@ void UIProcessWindowManagerMessage(EsWindow *window, EsMessage *message, Process
 
 		for (uintptr_t i = 0; i < window->sizeAlternatives.Length(); i++) {
 			SizeAlternative *alternative = &window->sizeAlternatives[i];
-			bool belowThreshold = window->width < alternative->widthThreshold * theming.scale 
-				|| window->height < alternative->heightThreshold * theming.scale;
+			bool belowThreshold = window->windowWidth < alternative->widthThreshold * theming.scale 
+				|| window->windowHeight < alternative->heightThreshold * theming.scale;
 			EsElementSetHidden(alternative->small, !belowThreshold);
 			EsElementSetHidden(alternative->big, belowThreshold);
 		}
diff --git a/desktop/textbox.cpp b/desktop/textbox.cpp
index 3c69e95..283a6eb 100644
--- a/desktop/textbox.cpp
+++ b/desktop/textbox.cpp
@@ -1791,7 +1791,7 @@ int ProcessTextboxMessage(EsElement *element, EsMessage *message) {
 		} else {
 			return 0;
 		}
-	} else if (message->type == ES_MSG_MOUSE_RIGHT_UP) {
+	} else if (message->type == ES_MSG_MOUSE_RIGHT_CLICK) {
 		textbox->inRightClickDrag = false;
 		EsMenu *menu = EsMenuCreate(textbox, ES_MENU_AT_CURSOR);
 		if (!menu) return ES_HANDLED;
@@ -1978,7 +1978,7 @@ void EsTextboxUseNumberOverlay(EsTextbox *textbox, bool defaultBehaviour) {
 				EsMessageSend(textbox, &m);
 			}
 		} else if (message->type == ES_MSG_GET_CURSOR) {
-			if (gui.draggingStarted) {
+			if (EsMouseIsLeftHeld()) {
 				message->cursorStyle = ES_CURSOR_BLANK;
 			} else if (~textbox->flags & ES_ELEMENT_DISABLED) {
 				message->cursorStyle = ES_CURSOR_RESIZE_VERTICAL;