3 files changed, 9 insertions, 3 deletions

diff --git a/src/defs.h b/src/defs.h
index 8b47790a..01bf2b3d 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -166,7 +166,9 @@ iLocalDef int acceptKeyMod_ReturnKeyBehavior(int behavior) {
 
 #if defined (iPlatformAppleDesktop)
 #   define iHaveNativeMenus /* main menu */
-#   define iHaveNativeContextMenus
+#   if defined (LAGRANGE_ENABLE_MAC_MENUS)
+#       define iHaveNativeContextMenus
+#   endif
 #endif
 
 /* UI labels that depend on the platform */
diff --git a/src/ui/util.c b/src/ui/util.c
index c75d7698..2b6ff929 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -975,7 +975,11 @@ void unselectAllNativeMenuItems_Widget(iWidget *menu) {
 }
 
 iLocalDef iBool isUsingMenuPopupWindows_(void) {
+#if defined (LAGRANGE_ENABLE_POPUP_MENUS)
     return deviceType_App() == desktop_AppDeviceType;
+#else
+    return iFalse;
+#endif
 }
 
 void releaseNativeMenu_Widget(iWidget *d) {
@@ -1019,7 +1023,7 @@ void openMenuFlags_Widget(iWidget *d, iInt2 windowCoord, iBool postCommands) {
         removeChild_Widget(parent_Widget(d), d); /* we'll borrow the widget for a while */
         const float pixelRatio = get_Window()->pixelRatio;
         iInt2 menuPos = add_I2(get_MainWindow()->place.normalRect.pos,
-                               divf_I2(windowCoord, pixelRatio));
+                               divf_I2(sub_I2(windowCoord, divi_I2(gap2_UI, 2)), pixelRatio));
         arrange_Widget(d);
         /* Check display bounds. */ {
             const iInt2 menuSize = divf_I2(d->rect.size, pixelRatio);
diff --git a/src/ui/window.c b/src/ui/window.c
index 3f8faaea..8197afd4 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -913,7 +913,7 @@ iBool processEvent_Window(iWindow *d, const SDL_Event *ev) {
         }
         default: {
             SDL_Event event = *ev;
-            if (event.type == SDL_USEREVENT && isCommand_UserEvent(ev, "window.unfreeze")) {
+            if (event.type == SDL_USEREVENT && isCommand_UserEvent(ev, "window.unfreeze") && mw) {
                 mw->isDrawFrozen = iFalse;
                 if (SDL_GetWindowFlags(d->win) & SDL_WINDOW_HIDDEN) {
                     SDL_ShowWindow(d->win);