diff --git a/launcher/ui/Main.qml b/launcher/ui/Main.qml
index e4f6fc2..d925710 100644
--- a/launcher/ui/Main.qml
+++ b/launcher/ui/Main.qml
@@ -22,6 +22,9 @@ Kirigami.ApplicationWindow {
     property bool checkedAutoLogin: false
 
     pageStack {
+        globalToolBar {
+            style: Kirigami.ApplicationHeaderStyle.ToolBar
+        }
         initialPage: Kirigami.Page {
             Kirigami.LoadingPlaceholder {
                 anchors.centerIn: parent
diff --git a/launcher/ui/Settings/SettingsPage.qml b/launcher/ui/Settings/SettingsPage.qml
index df3d35b..605f370 100644
--- a/launcher/ui/Settings/SettingsPage.qml
+++ b/launcher/ui/Settings/SettingsPage.qml
@@ -2,12 +2,31 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import org.kde.kirigamiaddons.settings as KirigamiSettings
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.components as KirigamiComponents
 
 import zone.xiv.astra
 
 KirigamiSettings.CategorizedSettings {
     id: settingsPage
 
+    KirigamiComponents.FloatingButton {
+        anchors {
+            right: parent.right
+            bottom: parent.bottom
+        }
+
+        z: 100
+        margins: Kirigami.Units.largeSpacing
+        visible: LauncherCore.isSteamDeck
+
+        action: Kirigami.Action {
+            text: i18nc("@action:button Close Settings")
+            icon.name: "dialog-close-symbolic"
+            onTriggered: pageStack.layers.pop()
+        }
+    }
+
     actions: [
         KirigamiSettings.SettingAction {
             actionName: "general"