diff --git a/applications/main/archive/scenes/archive_scene_browser.c b/applications/main/archive/scenes/archive_scene_browser.c
index e9da22484..285b1ebf9 100644
--- a/applications/main/archive/scenes/archive_scene_browser.c
+++ b/applications/main/archive/scenes/archive_scene_browser.c
@@ -287,15 +287,9 @@ bool archive_scene_browser_on_event(void* context, SceneManagerEvent event) {
             break;
         case ArchiveBrowserEventFileMenuRename:
             archive_show_file_menu(browser, false, false);
-            if(favorites) {
-                browser->callback(ArchiveBrowserEventEnterFavMove, browser->context);
-                //} else if((archive_is_known_app(selected->type)) && (selected->is_app == false)) {
-            } else {
-                // Added ability to rename files and folders
-                scene_manager_set_scene_state(
-                    archive->scene_manager, ArchiveAppSceneBrowser, SCENE_STATE_NEED_REFRESH);
-                scene_manager_next_scene(archive->scene_manager, ArchiveAppSceneRename);
-            }
+            scene_manager_set_scene_state(
+                archive->scene_manager, ArchiveAppSceneBrowser, SCENE_STATE_NEED_REFRESH);
+            scene_manager_next_scene(archive->scene_manager, ArchiveAppSceneRename);
             consumed = true;
             break;
         case ArchiveBrowserEventFileMenuDelete:
@@ -331,6 +325,7 @@ bool archive_scene_browser_on_event(void* context, SceneManagerEvent event) {
             consumed = true;
             break;
         case ArchiveBrowserEventEnterFavMove:
+            archive_show_file_menu(browser, false, false);
             furi_string_set(archive->fav_move_str, selected->path);
             archive_favorites_move_mode(archive->browser, true);
             consumed = true;
diff --git a/applications/main/archive/views/archive_browser_view.c b/applications/main/archive/views/archive_browser_view.c
index 835a28a68..039fb9591 100644
--- a/applications/main/archive/views/archive_browser_view.c
+++ b/applications/main/archive/views/archive_browser_view.c
@@ -125,7 +125,7 @@ static void render_item_menu(Canvas* canvas, ArchiveBrowserViewModel* model) {
                 archive_menu_add_item(
                     menu_array_push_raw(model->context_menu),
                     "Move",
-                    ArchiveBrowserEventFileMenuRename);
+                    ArchiveBrowserEventEnterFavMove);
             }
         }
     }