diff --git a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp
index 33dc010db..33e790eaa 100644
--- a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp
+++ b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp
@@ -242,7 +242,7 @@ void menuRadioSdManager(event_t _event)
           return;
         }
       }
-      // no break
+      break;
 
     case EVT_KEY_LONG(KEY_ENTER):
 #if !defined(PCBTARANIS)
@@ -254,7 +254,7 @@ void menuRadioSdManager(event_t _event)
         break;
       }
 #endif
-      if (s_editMode == 0) {
+      if (s_editMode <= 0) {
         killEvents(_event);
         char * line = reusableBuffer.sdmanager.lines[index];
         if (!strcmp(line, "..")) {
diff --git a/radio/src/gui/common/stdlcd/widgets.cpp b/radio/src/gui/common/stdlcd/widgets.cpp
index d93c9b1ba..646840e52 100644
--- a/radio/src/gui/common/stdlcd/widgets.cpp
+++ b/radio/src/gui/common/stdlcd/widgets.cpp
@@ -92,19 +92,37 @@ void editName(coord_t x, coord_t y, char * name, uint8_t size, event_t event, ui
             s_editMode = EDIT_MODIFY_STRING;
             cur = 0;
           }
-          else if (cur<size-1)
+          else if (cur < size - 1)
             cur++;
           else
             s_editMode = 0;
           break;
-        
+
+#if !defined(PCBTARANIS)
+        case EVT_KEY_BREAK(KEY_LEFT):
+          if (cur>0) cur--;
+          break;
+          
+        case EVT_KEY_BREAK(KEY_RIGHT):
+          if (cur<size-1) cur++;
+          break;
+#endif
+
+#if defined(PCBTARANIS)
         case EVT_KEY_LONG(KEY_ENTER):
+#else
+        case EVT_KEY_LONG(KEY_LEFT):
+        case EVT_KEY_LONG(KEY_RIGHT):
+#endif
+          
           if (attr & ZCHAR) {
+#if defined(PCBTARANIS)
             if (v == 0) {
               s_editMode = 0;
               killEvents(event);
             }
-            else if (v>=-26 && v<=26) {
+#endif
+            if (v >= -26 && v <= 26) {
               v = -v; // toggle case
             }
           }
@@ -114,13 +132,17 @@ void editName(coord_t x, coord_t y, char * name, uint8_t size, event_t event, ui
               killEvents(event);
               break;
             }
-            else if (v>='A' && v<='Z') {
-              v = 'a'+v-'A'; // toggle case
+            else if (v >= 'A' && v <= 'Z') {
+              v = 'a' + v - 'A'; // toggle case
             }
-            else if (v>='a' && v<='z') {
-              v = 'A'+v-'a'; // toggle case
+            else if (v >= 'a' && v <= 'z') {
+              v = 'A' + v - 'a'; // toggle case
             }
           }
+#if !defined(PCBTARANIS)
+          if (event==EVT_KEY_LONG(KEY_LEFT))
+            killEvents(KEY_LEFT);
+#endif
           break;
       }