diff --git a/frontend/apps/filemanager/filemanagershortcuts.lua b/frontend/apps/filemanager/filemanagershortcuts.lua
index e08e3cc7d..1e5c6970d 100644
--- a/frontend/apps/filemanager/filemanagershortcuts.lua
+++ b/frontend/apps/filemanager/filemanagershortcuts.lua
@@ -229,6 +229,18 @@ function FileManagerShortcuts:onShowFolderShortcutsDialog()
         onMenuHold = self.onMenuHold,
         _manager = self,
     }
+
+    -- Handle rotation events
+    local this = self
+    function self.fm_bookmark:onSetRotationMode(rotation)
+        if rotation ~= nil and rotation ~= Screen:getRotationMode() then
+            UIManager:close(this.fm_bookmark)
+            Screen:setRotationMode(rotation)
+            this:onShowFolderShortcutsDialog()
+        end
+        return true
+    end
+
     self:updateItemTable()
     UIManager:show(self.fm_bookmark)
 end