diff --git a/radio/sdcard/taranis-x9/CROSSFIRE/crossfire.lua b/radio/sdcard/taranis-x9/CROSSFIRE/crossfire.lua
index c446170a1..5eda62197 100644
--- a/radio/sdcard/taranis-x9/CROSSFIRE/crossfire.lua
+++ b/radio/sdcard/taranis-x9/CROSSFIRE/crossfire.lua
@@ -87,9 +87,9 @@ local function run(event)
     return 2
   elseif event == EVT_EXIT_BREAK then
     return 2
-  elseif event == EVT_PLUS_FIRST or event == EVT_PLUS_REPT then
+  elseif event == EVT_PLUS_FIRST or event == EVT_PLUS_REPT or event == EVT_ROT_LEFT then
     selectDevice(1)
-  elseif event == EVT_MINUS_FIRST or event == EVT_MINUS_REPT then
+  elseif event == EVT_MINUS_FIRST or event == EVT_MINUS_REPT or event == EVT_ROT_RIGHT then
     selectDevice(-1)
   end
 
diff --git a/radio/sdcard/taranis-x9/CROSSFIRE/device.lua b/radio/sdcard/taranis-x9/CROSSFIRE/device.lua
index fd60fd85c..2a1d8b7b8 100644
--- a/radio/sdcard/taranis-x9/CROSSFIRE/device.lua
+++ b/radio/sdcard/taranis-x9/CROSSFIRE/device.lua
@@ -451,15 +451,15 @@ local function runDevicePage(event)
       end
     end
   elseif edit then
-    if event == EVT_PLUS_FIRST or event == EVT_PLUS_REPT then
+    if event == EVT_PLUS_FIRST or event == EVT_PLUS_REPT or event == EVT_ROT_LEFT then
       incrField(1)
-    elseif event == EVT_MINUS_FIRST or event == EVT_MINUS_REPT then
+    elseif event == EVT_MINUS_FIRST or event == EVT_MINUS_REPT or event == EVT_ROT_RIGHT then
       incrField(-1)
     end
   else
-    if event == EVT_MINUS_FIRST then
+    if event == EVT_MINUS_FIRST or event == EVT_ROT_RIGHT then
       selectField(1)
-    elseif event == EVT_PLUS_FIRST then
+    elseif event == EVT_PLUS_FIRST or event == EVT_ROT_LEFT then
       selectField(-1)
     end
   end