diff --git a/Modules/ControlCenter/Components/HeaderPane.qml b/Modules/ControlCenter/Components/HeaderPane.qml
index 5a919f73..178c9237 100644
--- a/Modules/ControlCenter/Components/HeaderPane.qml
+++ b/Modules/ControlCenter/Components/HeaderPane.qml
@@ -11,6 +11,7 @@ Rectangle {
     signal powerButtonClicked()
     signal lockRequested()
     signal editModeToggled()
+    signal settingsButtonClicked()
 
     implicitHeight: 70
     radius: Theme.cornerRadius
@@ -96,6 +97,7 @@ Rectangle {
             iconColor: Theme.surfaceText
             backgroundColor: "transparent"
             onClicked: {
+                root.settingsButtonClicked()
                 settingsModal.show()
             }
         }
diff --git a/Modules/ControlCenter/ControlCenterPopout.qml b/Modules/ControlCenter/ControlCenterPopout.qml
index 1d07fa42..30db3e9c 100644
--- a/Modules/ControlCenter/ControlCenterPopout.qml
+++ b/Modules/ControlCenter/ControlCenterPopout.qml
@@ -140,6 +140,9 @@ DankPopout {
                         root.close()
                         root.lockRequested()
                     }
+                    onSettingsButtonClicked: {
+                        root.close()
+                    }
                 }
 
                 DragDropGrid {