diff --git a/containments/homescreens/folio/package/contents/ui/settings/SettingsComponent.qml b/containments/homescreens/folio/package/contents/ui/settings/SettingsComponent.qml
index 941fadf4..a2666e60 100644
--- a/containments/homescreens/folio/package/contents/ui/settings/SettingsComponent.qml
+++ b/containments/homescreens/folio/package/contents/ui/settings/SettingsComponent.qml
@@ -23,6 +23,17 @@ Item {
 
     readonly property bool homeScreenInteractive: !appletListViewer.open
 
+    Connections {
+        target: folio.HomeScreenState
+
+        // Close applet viewer when settings view closes
+        function onViewStateChanged() {
+            if (folio.HomeScreenState.viewState !== Folio.HomeScreenState.SettingsView) {
+                appletListViewer.requestClose();
+            }
+        }
+    }
+
     MouseArea {
         id: closeSettings