diff --git a/quickshell/Modals/Clipboard/ClipboardHistoryModal.qml b/quickshell/Modals/Clipboard/ClipboardHistoryModal.qml
index e55df9cf6..ae71cae80 100644
--- a/quickshell/Modals/Clipboard/ClipboardHistoryModal.qml
+++ b/quickshell/Modals/Clipboard/ClipboardHistoryModal.qml
@@ -76,8 +76,6 @@ DModal {
     modalWidth: Math.min(ClipboardConstants.sizeWidth(SettingsData.clipboardSize), screenWidth - Theme.spacingXL * 2)
     modalHeight: Math.min(ClipboardConstants.sizeHeight(SettingsData.clipboardSize), screenHeight - Theme.spacingXL * 2)
     backgroundColor: Theme.floatingWindowSurface
-    borderColor: Theme.outlineVariant
-    borderWidth: Theme.outlineWidth
     enableShadow: true
     closeOnEscapeKey: (contentLoader.item?.mode ?? "history") === "history"
     onBackgroundClicked: hide()
diff --git a/quickshell/Modals/Common/DModal.qml b/quickshell/Modals/Common/DModal.qml
index 4afe81ad6..cffc97718 100644
--- a/quickshell/Modals/Common/DModal.qml
+++ b/quickshell/Modals/Common/DModal.qml
@@ -135,6 +135,7 @@ Item {
 
             modalHandle: root
             connected: root._resolvedConnected
+            handleFocusScope: _modalFocusScope
 
             onShouldBeVisibleChanged: {
                 if (root.shouldBeVisible !== host.shouldBeVisible)
diff --git a/quickshell/Modals/Common/DModalHost.qml b/quickshell/Modals/Common/DModalHost.qml
index b0a4f64b9..796e5a031 100644
--- a/quickshell/Modals/Common/DModalHost.qml
+++ b/quickshell/Modals/Common/DModalHost.qml
@@ -71,6 +71,7 @@ Item {
     readonly property bool effectiveBlurEnabled: Theme.connectedSurfaceBlurEnabled
     property bool enableShadow: modalHandle.enableShadow
     property alias modalFocusScope: focusScope
+    property Item handleFocusScope: null
     property bool shouldBeVisible: false
     property bool isClosing: false
     property bool shouldHaveFocus: shouldBeVisible
@@ -851,6 +852,7 @@ Item {
                             anchors.fill: parent
                             focus: root.shouldBeVisible
                             clip: false
+                            Keys.forwardTo: root.handleFocusScope ? [root.handleFocusScope, focusScope] : [focusScope]
 
                             Item {
                                 id: directContentWrapper
diff --git a/quickshell/Modals/MuxModal.qml b/quickshell/Modals/MuxModal.qml
index 87a5bea4d..a219c276b 100644
--- a/quickshell/Modals/MuxModal.qml
+++ b/quickshell/Modals/MuxModal.qml
@@ -131,8 +131,6 @@ DModal {
     modalWidth: 600
     modalHeight: 600
     backgroundColor: Theme.floatingWindowSurface
-    borderColor: Theme.outlineMedium
-    borderWidth: 1
     enableShadow: true
     keepContentLoaded: true