diff --git a/applications/main/subghz/scenes/subghz_scene_delete_raw.c b/applications/main/subghz/scenes/subghz_scene_delete_raw.c
index 6fe304c4a..ec6b93653 100644
--- a/applications/main/subghz/scenes/subghz_scene_delete_raw.c
+++ b/applications/main/subghz/scenes/subghz_scene_delete_raw.c
@@ -66,13 +66,7 @@ bool subghz_scene_delete_raw_on_event(void* context, SceneManagerEvent event) {
         if(event.event == SubGhzCustomEventSceneDeleteRAW) {
             furi_string_set(subghz->file_path_tmp, subghz->file_path);
             if(subghz_delete_file(subghz)) {
-                if(subghz_rx_key_state_get(subghz) != SubGhzRxKeyStateRAWLoad) {
-                    subghz_rx_key_state_set(subghz, SubGhzRxKeyStateIDLE);
-                    scene_manager_next_scene(subghz->scene_manager, SubGhzSceneDeleteSuccess);
-                } else {
-                    scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSaved);
-                }
-
+                scene_manager_next_scene(subghz->scene_manager, SubGhzSceneDeleteSuccess);
             } else {
                 scene_manager_search_and_switch_to_previous_scene(
                     subghz->scene_manager, SubGhzSceneStart);
diff --git a/applications/main/subghz/scenes/subghz_scene_delete_success.c b/applications/main/subghz/scenes/subghz_scene_delete_success.c
index 46a593eb9..ddfd23abb 100644
--- a/applications/main/subghz/scenes/subghz_scene_delete_success.c
+++ b/applications/main/subghz/scenes/subghz_scene_delete_success.c
@@ -26,15 +26,24 @@ bool subghz_scene_delete_success_on_event(void* context, SceneManagerEvent event
 
     if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == SubGhzCustomEventSceneDeleteSuccess) {
-            if(scene_manager_search_and_switch_to_previous_scene(
-                   subghz->scene_manager, SubGhzSceneReadRAW)) {
-                scene_manager_next_scene(subghz->scene_manager, SubGhzSceneReadRAW);
-            } else if(scene_manager_search_and_switch_to_previous_scene(
-                          subghz->scene_manager, SubGhzSceneSaved)) {
+            if(subghz_rx_key_state_get(subghz) == SubGhzRxKeyStateRAWLoad) {
+                if(scene_manager_search_and_switch_to_previous_scene(
+                       subghz->scene_manager, SubGhzSceneSaved)) {
+                } else {
+                    scene_manager_search_and_switch_to_previous_scene(
+                        subghz->scene_manager, SubGhzSceneStart);
+                }
             } else {
-                scene_manager_search_and_switch_to_previous_scene(
-                    subghz->scene_manager, SubGhzSceneStart);
+                subghz_rx_key_state_set(subghz, SubGhzRxKeyStateIDLE);
+
+                if(scene_manager_search_and_switch_to_previous_scene(
+                       subghz->scene_manager, SubGhzSceneReadRAW)) {
+                } else {
+                    scene_manager_search_and_switch_to_previous_scene(
+                        subghz->scene_manager, SubGhzSceneStart);
+                }
             }
+
             return true;
         }
     }
diff --git a/applications/main/subghz/scenes/subghz_scene_saved.c b/applications/main/subghz/scenes/subghz_scene_saved.c
index 95abd443e..bf33a0339 100644
--- a/applications/main/subghz/scenes/subghz_scene_saved.c
+++ b/applications/main/subghz/scenes/subghz_scene_saved.c
@@ -10,6 +10,7 @@ void subghz_scene_saved_on_enter(void* context) {
             subghz_rx_key_state_set(subghz, SubGhzRxKeyStateRAWLoad);
             scene_manager_next_scene(subghz->scene_manager, SubGhzSceneReadRAW);
         } else {
+            subghz_rx_key_state_set(subghz, SubGhzRxKeyStateRAWLoad);
             scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSavedMenu);
         }
     } else {