diff --git a/openrtx/src/ui/ui.c b/openrtx/src/ui/ui.c
index c8f4fa14..ac5fa847 100644
--- a/openrtx/src/ui/ui.c
+++ b/openrtx/src/ui/ui.c
@@ -543,11 +543,11 @@ void _ui_fsm_menuMacro(kbd_msg_t msg, bool *sync_rtx) {
     }
 #else // Use left and right buttons or relative position knob
     if(msg.keys & KEY_LEFT) {
-        state.sqlLevel = (state.sqlLevel == 15) 15 : state.sqlLevel++;
+        state.sqlLevel = (state.sqlLevel == 0) ? 0 : state.sqlLevel - 1;
         *sync_rtx = true;
     }
     else if(msg.keys & KEY_RIGHT) {
-        state.sqlLevel = (state.sqlLevel == 0) 0 : state.sqlLevel--;
+        state.sqlLevel = (state.sqlLevel == 15) ? 15 : state.sqlLevel + 1;
         *sync_rtx = true;
     }
 #endif
diff --git a/platform/drivers/keyboard/keyboard_linux.c b/platform/drivers/keyboard/keyboard_linux.c
index 5e0ce871..e2e9e214 100644
--- a/platform/drivers/keyboard/keyboard_linux.c
+++ b/platform/drivers/keyboard/keyboard_linux.c
@@ -46,6 +46,8 @@ keyboard_t kbd_getKeys() {
     if (state[SDL_SCANCODE_ESCAPE]) keys |= KEY_ESC;
     if (state[SDL_SCANCODE_DOWN]) keys |= KEY_DOWN;
     if (state[SDL_SCANCODE_UP]) keys |= KEY_UP;
+    if (state[SDL_SCANCODE_LEFT]) keys |= KEY_LEFT;
+    if (state[SDL_SCANCODE_RIGHT]) keys |= KEY_RIGHT;
     if (state[SDL_SCANCODE_RETURN]) keys |= KEY_ENTER;
     if (state[SDL_SCANCODE_NONUSHASH]) keys |= KEY_HASH;
     if (state[SDL_SCANCODE_MINUS]) keys |= KEY_F1;