diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt
index b0cab9afe..94f2a1a0c 100644
--- a/radio/src/CMakeLists.txt
+++ b/radio/src/CMakeLists.txt
@@ -183,7 +183,7 @@ elseif(PCB STREQUAL TARANIS)
   set(VIRTUAL_INPUTS YES)
   add_definitions(-DPCBTARANIS)
   add_definitions(-DAUDIO -DVOICE -DRTCLOCK)
-  add_definitions(-DDBLKEYS -DVIRTUALINPUTS -DLUAINPUTS -DXCURVES -DVARIO)
+  add_definitions(-DVIRTUALINPUTS -DLUAINPUTS -DXCURVES -DVARIO)
   set(GUI_SRC ${GUI_SRC} bmp.cpp menu_model_inputs.cpp menu_model_mixes.cpp menu_model_display.cpp menu_general_diagkeys.cpp menu_general_diaganas.cpp menu_general_hardware.cpp view_channels.cpp view_telemetry.cpp view_text.cpp view_about.cpp)
   set(TARGET_SRC ${TARGET_SRC} board_taranis.cpp rtc_driver.cpp)
   set(FIRMWARE_SRC ${FIRMWARE_SRC} loadboot.cpp)
@@ -245,8 +245,7 @@ elseif(PCB STREQUAL SKY9X OR PCB STREQUAL 9XRPRO OR PCB STREQUAL AR9X)
   set(TARGET_DIR sky9x)
   set(FIRMWARE_DEPENDENCIES ${FIRMWARE_DEPENDENCIES} 9x_bitmaps)
   add_definitions(-DPCBSKY9X)
-  add_definitions(-DAUDIO -DVOICE -DRTCLOCK)
-  add_definitions(-DDBLKEYS -DVARIO)
+  add_definitions(-DAUDIO -DVOICE -DRTCLOCK -DVARIO)
   add_definitions(-DEEPROM_VARIANT=0)
   set(GUI_SRC ${GUI_SRC} ${9X_GUI_SRC} menu_general_hardware.cpp view_telemetry.cpp view_text.cpp view_about.cpp)
   set(FIRMWARE_TARGET_SRC ${FIRMWARE_TARGET_SRC} core_cm3.c board_lowlevel.c crt.c vectors_sam3s.c)
@@ -347,6 +346,13 @@ else()
   message(FATAL_ERROR "Unknown PCB '${PCB}'")
 endif()
 
+if(NOT PCB STREQUAL 9XR AND NOT PCB STREQUAL 9XRPRO)
+  option(DBLKEYS "Double Keys" ON)
+  if(DBLKEYS)
+    add_definitions(-DDBLKEYS)
+  endif()
+endif()
+
 if(CPU_TYPE STREQUAL STM32F4)
   set(CPU_FAMILY STM32)
   set(MCU cortex-m4)
diff --git a/radio/src/gui/horus/navigation.cpp b/radio/src/gui/horus/navigation.cpp
index 6e0794a0c..3b4c30650 100644
--- a/radio/src/gui/horus/navigation.cpp
+++ b/radio/src/gui/horus/navigation.cpp
@@ -110,7 +110,7 @@ int checkIncDec(evt_t event, int val, int i_min, int i_max, unsigned int i_flags
 {
   int newval = val;
 
-#if defined(DBLKEYS)
+#if 0
   uint32_t in = KEYS_PRESSED();
   if (!(i_flags & NO_DBLKEYS) && (EVT_KEY_MASK(event))) {
     bool dblkey = true;
@@ -142,7 +142,6 @@ int checkIncDec(evt_t event, int val, int i_min, int i_max, unsigned int i_flags
       killEvents(KEY_DOWN);
       killEvents(KEY_RIGHT);
       killEvents(KEY_LEFT);
-      killEvents(KEY_MENU);
       killEvents(KEY_ENTER);
       killEvents(KEY_EXIT);
       event = 0;