diff --git a/radio/src/gui/128x64/model_display.cpp b/radio/src/gui/128x64/model_display.cpp
index 3da6c10ff..1ae5ed2d1 100644
--- a/radio/src/gui/128x64/model_display.cpp
+++ b/radio/src/gui/128x64/model_display.cpp
@@ -210,7 +210,7 @@ void menuModelDisplay(event_t event)
             }
           }
           else if (attr) {
-            MOVE_CURSOR_FROM_HERE();
+            menuHorizontalPosition = 0;
           }
           if (attr && s_editMode>0) {
             switch (menuHorizontalPosition) {
diff --git a/radio/src/keys.h b/radio/src/keys.h
index f433f6485..3b78a8475 100644
--- a/radio/src/keys.h
+++ b/radio/src/keys.h
@@ -103,14 +103,17 @@ class Key
 extern Key keys[NUM_KEYS];
 extern event_t s_evt;
 
-#define putEvent(evt) s_evt = evt
+inline void putEvent(event_t evt)
+{
+  s_evt = evt;
+}
 
 void pauseEvents(event_t event);
 void killEvents(event_t event);
 
-  bool clearKeyEvents();
-  event_t getEvent(bool trim=false);
-  bool keyDown();
+bool clearKeyEvents();
+event_t getEvent(bool trim=false);
+bool keyDown();