diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c
index 7b09586e8..878c2cd12 100644
--- a/polymer/eduke32/build/src/engine.c
+++ b/polymer/eduke32/build/src/engine.c
@@ -13736,11 +13736,10 @@ int32_t clipmove(vec3_t *pos, int16_t *sectnum,
 #endif
             if (wal->nextsector < 0 || (wal->cstat&dawalclipmask))
             {
+                clipyou = 1;
 #ifdef YAX_ENABLE
                 int16_t cb = yax_getbunch(dasect, YAX_CEILING);
 
-                clipyou = 1;
-
                 if (cb >= 0 && (sec->ceilingstat & yax_waltosecmask(dawalclipmask)) == 0)
                 {
                     int32_t ynw = yax_getnextwall(j, YAX_CEILING);
@@ -13751,8 +13750,6 @@ int32_t clipmove(vec3_t *pos, int16_t *sectnum,
                         clipyou = check_floor_curb(dasect, wall[ynw].nextsector, flordist, pos->z, dax, day);
                     }
                 }
-#else
-                clipyou = 1;
 #endif
             }
             else if (editstatus == 0)
diff --git a/polymer/eduke32/source/menus.c b/polymer/eduke32/source/menus.c
index 8158329aa..54fa36c3a 100644
--- a/polymer/eduke32/source/menus.c
+++ b/polymer/eduke32/source/menus.c
@@ -5439,7 +5439,7 @@ void M_DisplayMenus(void)
     if (VM_HaveEvent(EVENT_DISPLAYMENUREST))
         VM_OnEvent(EVENT_DISPLAYMENUREST, g_player[screenpeek].ps->i, screenpeek);
 
-    if (mousestatus)
+    if (tilesiz[CROSSHAIR].x > 0 && mousestatus)
     {
 #if !defined EDUKE32_TOUCH_DEVICES
         if (!MOUSEACTIVECONDITION)