diff --git a/radio/sdcard/taranis-x7/CROSSFIRE/crossfire.lua b/radio/sdcard/taranis-x7/CROSSFIRE/crossfire.lua
index 0870b1b40..8d409ccad 100644
--- a/radio/sdcard/taranis-x7/CROSSFIRE/crossfire.lua
+++ b/radio/sdcard/taranis-x7/CROSSFIRE/crossfire.lua
@@ -87,9 +87,9 @@ local function run(event)
     return 2
   elseif event == EVT_EXIT_BREAK then
     return 2
-  elseif event == EVT_ROT_LEFT then
+  elseif event == EVT_ROT_LEFT or event == EVT_DOWN_BREAK then
     selectDevice(1)
-  elseif event == EVT_ROT_RIGHT then
+  elseif event == EVT_ROT_RIGHT or event == EVT_UP_BREAK then
     selectDevice(-1)
   end
 
@@ -100,7 +100,7 @@ local function run(event)
   else
     for i=1, #devices do
       local attr = (lineIndex == i and INVERS or 0)
-      if event == EVT_ROT_BREAK and attr == INVERS then
+      if (event == EVT_ROT_BREAK or event == EVT_RIGHT_BREAK) and attr == INVERS then
           crossfireTelemetryPush(0x28, { devices[i].id, 0xEA })
           return "device.lua"
       end
diff --git a/radio/sdcard/taranis-x7/CROSSFIRE/device.lua b/radio/sdcard/taranis-x7/CROSSFIRE/device.lua
index b1a5c0ec6..616f23842 100644
--- a/radio/sdcard/taranis-x7/CROSSFIRE/device.lua
+++ b/radio/sdcard/taranis-x7/CROSSFIRE/device.lua
@@ -430,7 +430,7 @@ local function runDevicePage(event)
     else
       return "crossfire.lua"
     end
-  elseif event == EVT_ROT_BREAK then        -- toggle editing/selecting current field
+  elseif event == EVT_ROT_BREAK or event == EVT_RIGHT_BREAK then        -- toggle editing/selecting current field
     local field = getField(lineIndex)
     if field.name then
       if field.type == 10 then
@@ -451,15 +451,15 @@ local function runDevicePage(event)
       end
     end
   elseif edit then
-    if event == EVT_ROT_RIGHT then
+    if event == EVT_ROT_RIGHT or event == EVT_DOWN_BREAK then
       incrField(1)
-    elseif event == EVT_ROT_LEFT then
+    elseif event == EVT_ROT_LEFT or event == EVT_UP_BREAK then
       incrField(-1)
     end
   else
-    if event == EVT_ROT_RIGHT then
+    if event == EVT_ROT_RIGHT or event == EVT_DOWN_BREAK then
       selectField(1)
-    elseif event == EVT_ROT_LEFT then
+    elseif event == EVT_ROT_LEFT or event == EVT_UP_BREAK then
       selectField(-1)
     end
   end