diff --git a/App/CMakeLists.txt b/App/CMakeLists.txt
index c24707d3..c6212f01 100644
--- a/App/CMakeLists.txt
+++ b/App/CMakeLists.txt
@@ -148,6 +148,7 @@ enable_feature(ENABLE_REDUCE_LOW_MID_TX_POWER)
 enable_feature(ENABLE_BYP_RAW_DEMODULATORS)
 enable_feature(ENABLE_BLMIN_TMP_OFF)
 enable_feature(ENABLE_SCAN_RANGES)
+enable_feature(ENABLE_NAVIG_LEFT_RIGHT)
 
 # ---- CONTRIB MODS ----
 
diff --git a/App/app/menu.c b/App/app/menu.c
index 74325a91..732720ac 100644
--- a/App/app/menu.c
+++ b/App/app/menu.c
@@ -1975,10 +1975,24 @@ void MENU_ProcessKeys(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
             MENU_Key_MENU(bKeyPressed, bKeyHeld);
             break;
         case KEY_UP:
-            MENU_Key_UP_DOWN(bKeyPressed, bKeyHeld,  1);
+            #ifdef ENABLE_NAVIG_LEFT_RIGHT
+                if(gIsInSubMenu)
+                    MENU_Key_UP_DOWN(bKeyPressed, bKeyHeld, -1);
+                else
+                    MENU_Key_UP_DOWN(bKeyPressed, bKeyHeld, 1);
+            #else
+                MENU_Key_UP_DOWN(bKeyPressed, bKeyHeld, 1);
+            #endif
             break;
         case KEY_DOWN:
-            MENU_Key_UP_DOWN(bKeyPressed, bKeyHeld, -1);
+            #ifdef ENABLE_NAVIG_LEFT_RIGHT
+                if(gIsInSubMenu)
+                    MENU_Key_UP_DOWN(bKeyPressed, bKeyHeld, 1);
+                else
+                    MENU_Key_UP_DOWN(bKeyPressed, bKeyHeld, -1);
+            #else
+                MENU_Key_UP_DOWN(bKeyPressed, bKeyHeld, -1);
+            #endif
             break;
         case KEY_EXIT:
             MENU_Key_EXIT(bKeyPressed, bKeyHeld);
diff --git a/CMakePresets.json b/CMakePresets.json
index 8c57f36e..c836396c 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -66,6 +66,7 @@
                 "ENABLE_AM_FIX_SHOW_DATA": false,
                 "ENABLE_AGC_SHOW_DATA": false,
                 "ENABLE_UART_RW_BK_REGS": false,
+                "ENABLE_NAVIG_LEFT_RIGHT": true,
                 "ENABLE_SWD": false,
                 "VERSION_STRING_1": "v0.22",
                 "VERSION_STRING_2": "v4.2"