diff --git a/frontend/apps/filemanager/filemanagermenu.lua b/frontend/apps/filemanager/filemanagermenu.lua
index d820c29d4..d3d8d37ea 100644
--- a/frontend/apps/filemanager/filemanagermenu.lua
+++ b/frontend/apps/filemanager/filemanagermenu.lua
@@ -24,6 +24,9 @@ function FileManagerMenu:init()
             -- top menu
         },
         -- items in top menu
+        filemanager_settings = {
+            icon = "resources/icons/appbar.cabinet.files.png",
+        },
         setting = {
             icon = "resources/icons/appbar.settings.png",
         },
diff --git a/frontend/ui/elements/filemanager_menu_order.lua b/frontend/ui/elements/filemanager_menu_order.lua
index d3b0d7ca6..883dd0680 100644
--- a/frontend/ui/elements/filemanager_menu_order.lua
+++ b/frontend/ui/elements/filemanager_menu_order.lua
@@ -1,12 +1,13 @@
 local order = {
     ["KOMenu:menu_buttons"] = {
+        "filemanager_settings",
         "setting",
         "tools",
         "search",
         "plus_menu",
         "main",
     },
-    setting = {
+    filemanager_settings = {
         "filemanager_display_mode",
         "show_hidden_files",
         "items_per_page",
@@ -15,8 +16,8 @@ local order = {
         "reverse_sorting",
         "----------------------------",
         "start_with",
-        "screensaver",
-        "----------------------------",
+    },
+    setting = {
         -- common settings
         -- those that don't exist will simply be skipped during menu gen
         "frontlight", -- if Device:hasFrontlight()
@@ -24,6 +25,7 @@ local order = {
         "----------------------------",
         "network",
         "screen",
+        "screensaver",
         "document",
         "----------------------------",
         "language",
diff --git a/frontend/ui/widget/touchmenu.lua b/frontend/ui/widget/touchmenu.lua
index 68270bab8..7358fe207 100644
--- a/frontend/ui/widget/touchmenu.lua
+++ b/frontend/ui/widget/touchmenu.lua
@@ -337,7 +337,7 @@ function TouchMenuBar:switchToTab(index)
     -- a little safety check
     -- don't auto-activate a non-existent index
     if index > #self.icon_widgets then
-        index = 1
+        index = #self.icon_widgets
     end
     self.icon_widgets[index].callback()
 end