diff --git a/radio/src/gui/128x64/gui.h b/radio/src/gui/128x64/gui.h
index 98b3fc235..6b814dd46 100644
--- a/radio/src/gui/128x64/gui.h
+++ b/radio/src/gui/128x64/gui.h
@@ -331,7 +331,7 @@ void drawStatusLine();
   #define IS_ROTARY_EVENT(evt)         (0)
   void repeatLastCursorMove(event_t event);
   #define REPEAT_LAST_CURSOR_MOVE()    repeatLastCursorMove(event)
-  #define MOVE_CURSOR_FROM_HERE()      REPEAT_LAST_CURSOR_MOVE()
+  #define MOVE_CURSOR_FROM_HERE()      if (menuHorizontalPosition > 0) REPEAT_LAST_CURSOR_MOVE()
 #endif
 
 // TODO enum
diff --git a/radio/src/gui/128x64/model_display.cpp b/radio/src/gui/128x64/model_display.cpp
index 1ae5ed2d1..cc8db7a72 100644
--- a/radio/src/gui/128x64/model_display.cpp
+++ b/radio/src/gui/128x64/model_display.cpp
@@ -149,11 +149,9 @@ void menuModelDisplay(event_t event)
             }
           }
         }
-#if !defined(PCBXLITE)
         else if (attr) {
           MOVE_CURSOR_FROM_HERE();
         }
-#endif
 #endif
         break;
       }
@@ -210,7 +208,7 @@ void menuModelDisplay(event_t event)
             }
           }
           else if (attr) {
-            menuHorizontalPosition = 0;
+            MOVE_CURSOR_FROM_HERE();
           }
           if (attr && s_editMode>0) {
             switch (menuHorizontalPosition) {
diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp
index 785df9271..ca8199462 100644
--- a/radio/src/gui/128x64/radio_setup.cpp
+++ b/radio/src/gui/128x64/radio_setup.cpp
@@ -571,9 +571,7 @@ void menuRadioSetup(event_t event)
           resumePulses();
           clearKeyEvents();
         }
-#if defined(ROTARY_ENCODER_NAVIGATION)
         MOVE_CURSOR_FROM_HERE();
-#endif
         break;
     }
   }