diff --git a/applications/external/esp_flasher/scenes/esp_flasher_scene_devboard.c b/applications/external/esp_flasher/scenes/esp_flasher_scene_devboard.c
index 512a41f22..ccb8f527c 100644
--- a/applications/external/esp_flasher/scenes/esp_flasher_scene_devboard.c
+++ b/applications/external/esp_flasher/scenes/esp_flasher_scene_devboard.c
@@ -1,9 +1,9 @@
 #include "../esp_flasher_app_i.h"
 
 enum SubmenuIndex {
-    SubmenuIndexMarauder,
-    SubmenuIndexEvilPortal,
     SubmenuIndexBlackMagic,
+    SubmenuIndexEvilPortal,
+    SubmenuIndexMarauder,
 };
 
 void esp_flasher_scene_devboard_submenu_callback(void* context, uint32_t index) {
@@ -52,14 +52,19 @@ bool esp_flasher_scene_devboard_on_event(void* context, SceneManagerEvent event)
     if(event.type == SceneManagerEventTypeCustom) {
         const char* path = NULL;
         consumed = true;
-        if(event.event == SubmenuIndexBlackMagic) {
+        switch(event.event) {
+        case SubmenuIndexBlackMagic:
             path = APP_DATA_PATH("Black_Magic.bin");
-        } else if(event.event == SubmenuIndexEvilPortal) {
+            break;
+        case SubmenuIndexEvilPortal:
             path = APP_DATA_PATH("Evil_Portal.bin");
-        } else if(event.event == SubmenuIndexMarauder) {
+            break;
+        case SubmenuIndexMarauder:
             path = APP_DATA_PATH("Marauder.bin");
-        } else {
+            break;
+        default:
             consumed = false;
+            break;
         }
 
         if(consumed) {
diff --git a/applications/external/esp_flasher/scenes/esp_flasher_scene_start.c b/applications/external/esp_flasher/scenes/esp_flasher_scene_start.c
index 4277fb438..0ae9eca30 100644
--- a/applications/external/esp_flasher/scenes/esp_flasher_scene_start.c
+++ b/applications/external/esp_flasher/scenes/esp_flasher_scene_start.c
@@ -49,14 +49,14 @@ bool esp_flasher_scene_start_on_event(void* context, SceneManagerEvent event) {
     EspFlasherApp* app = context;
     bool consumed = false;
     if(event.type == SceneManagerEventTypeCustom) {
-        if(event.event == SubmenuIndexEspFlasherAbout) {
-            scene_manager_next_scene(app->scene_manager, EspFlasherSceneAbout);
+        if(event.event == SubmenuIndexEspFlasherDevboardFlash) {
+            scene_manager_next_scene(app->scene_manager, EspFlasherSceneDevboard);
             consumed = true;
         } else if(event.event == SubmenuIndexEspFlasherFlash) {
             scene_manager_next_scene(app->scene_manager, EspFlasherSceneBrowse);
             consumed = true;
-        } else if(event.event == SubmenuIndexEspFlasherDevboardFlash) {
-            scene_manager_next_scene(app->scene_manager, EspFlasherSceneDevboard);
+        } else if(event.event == SubmenuIndexEspFlasherAbout) {
+            scene_manager_next_scene(app->scene_manager, EspFlasherSceneAbout);
             consumed = true;
         }
         scene_manager_set_scene_state(app->scene_manager, EspFlasherSceneStart, event.event);