diff --git a/containments/homescreens/folio/package/contents/ui/main.qml b/containments/homescreens/folio/package/contents/ui/main.qml
index 10d4102d..faf1be4e 100644
--- a/containments/homescreens/folio/package/contents/ui/main.qml
+++ b/containments/homescreens/folio/package/contents/ui/main.qml
@@ -86,7 +86,7 @@ ContainmentItem {
         }
 
         if (isInWindow) {
-            // only minimize windows and go to homescreen when not in docked mode
+            // Only minimize windows and go to homescreen when not in docked mode
             if (!ShellSettings.Settings.convergenceModeEnabled) {
                 folio.HomeScreenState.closeFolder();
                 folio.HomeScreenState.closeSearchWidget();
@@ -95,7 +95,13 @@ ContainmentItem {
 
                 WindowPlugin.WindowUtil.minimizeAll();
             }
-        } else { // if we are on the homescreen
+
+            // Always ensure settings view is closed
+            if (folio.HomeScreenState.viewState == Folio.HomeScreenState.SettingsView) {
+                folio.HomeScreenState.closeSettingsView();
+            }
+
+        } else { // If we are already on the homescreen
             switch (folio.HomeScreenState.viewState) {
                 case Folio.HomeScreenState.PageView:
                     if (folio.HomeScreenState.currentPage === 0) {
@@ -113,6 +119,9 @@ ContainmentItem {
                 case Folio.HomeScreenState.FolderView:
                     folio.HomeScreenState.closeFolder();
                     break;
+                case Folio.HomeScreenState.SettingsView:
+                    folio.HomeScreenState.closeSettingsView();
+                    break;
             }
         }
     }