diff --git a/applications/main/archive/helpers/archive_browser.c b/applications/main/archive/helpers/archive_browser.c
index 9cb66a5e5..5583c43f5 100644
--- a/applications/main/archive/helpers/archive_browser.c
+++ b/applications/main/archive/helpers/archive_browser.c
@@ -463,7 +463,6 @@ void archive_switch_tab(ArchiveBrowserView* browser, InputKey key) {
         } else {
             tab = (tab + 1) % ArchiveTabTotal;
         }
-        if(tab == ArchiveTabInternal && !furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) continue;
         break;
     }
 
diff --git a/applications/main/archive/helpers/archive_files.h b/applications/main/archive/helpers/archive_files.h
index a9c33c9f6..27f6353a7 100644
--- a/applications/main/archive/helpers/archive_files.h
+++ b/applications/main/archive/helpers/archive_files.h
@@ -6,7 +6,6 @@
 #include <m-string.h>
 #include <storage/storage.h>
 #include "toolbox/path.h"
-#include "../../../settings/xtreme_settings/xtreme_settings.h"
 
 #define FAP_MANIFEST_MAX_ICON_SIZE 32
 
@@ -85,13 +84,11 @@ static void ArchiveFile_t_clear(ArchiveFile_t* obj) {
 }
 
 static int ArchiveFile_t_cmp(const ArchiveFile_t* a, const ArchiveFile_t* b) {
-    if(!XTREME_SETTINGS()->sort_ignore_dirs) {
-        if(a->type == ArchiveFileTypeFolder && b->type != ArchiveFileTypeFolder) {
-            return -1;
-        }
-        if(a->type != ArchiveFileTypeFolder && b->type == ArchiveFileTypeFolder) {
-            return 1;
-        }
+    if(a->type == ArchiveFileTypeFolder && b->type != ArchiveFileTypeFolder) {
+        return -1;
+    }
+    if(a->type != ArchiveFileTypeFolder && b->type == ArchiveFileTypeFolder) {
+        return 1;
     }
 
     return furi_string_cmpi(a->path, b->path);
diff --git a/applications/services/gui/modules/file_browser.c b/applications/services/gui/modules/file_browser.c
index 03b3b0eab..bcd266d0e 100644
--- a/applications/services/gui/modules/file_browser.c
+++ b/applications/services/gui/modules/file_browser.c
@@ -87,13 +87,11 @@ static int BrowserItem_t_cmp(const BrowserItem_t* a, const BrowserItem_t* b) {
     if(b->type == BrowserItemTypeBack) {
         return 1;
     }
-    if(!XTREME_SETTINGS()->sort_ignore_dirs) {
-        if(a->type == BrowserItemTypeFolder && b->type != BrowserItemTypeFolder) {
-            return -1;
-        }
-        if(a->type != BrowserItemTypeFolder && b->type == BrowserItemTypeFolder) {
-            return 1;
-        }
+    if(a->type == BrowserItemTypeFolder && b->type != BrowserItemTypeFolder) {
+        return -1;
+    }
+    if(a->type != BrowserItemTypeFolder && b->type == BrowserItemTypeFolder) {
+        return 1;
     }
 
     return furi_string_cmpi(a->path, b->path);