From 21ddc3cc3f074cfa17bc16d7a03e33eed974c277 Mon Sep 17 00:00:00 2001
From: bbedward <bbedward@gmail.com>
Date: Tue, 23 Jun 2026 22:33:27 -0400
Subject: [PATCH] popout: fix focus regression on close

---
 quickshell/Widgets/DankPopoutConnected.qml  | 2 +-
 quickshell/Widgets/DankPopoutStandalone.qml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/quickshell/Widgets/DankPopoutConnected.qml b/quickshell/Widgets/DankPopoutConnected.qml
index d0221b82..affba4dd 100644
--- a/quickshell/Widgets/DankPopoutConnected.qml
+++ b/quickshell/Widgets/DankPopoutConnected.qml
@@ -782,7 +782,7 @@ Item {
         WlrLayershell.namespace: root.layerNamespace
         WlrLayershell.layer: root.effectivePopoutLayer
         WlrLayershell.exclusiveZone: -1
-        WlrLayershell.keyboardFocus: KeyboardFocus.keyboardFocus(shouldBeVisible || isClosing, customKeyboardFocus)
+        WlrLayershell.keyboardFocus: KeyboardFocus.keyboardFocus(shouldBeVisible || (isClosing && CompositorService.useHyprlandFocusGrab), customKeyboardFocus)
 
         readonly property bool _fullHeight: root.fullHeightSurface
         anchors {
diff --git a/quickshell/Widgets/DankPopoutStandalone.qml b/quickshell/Widgets/DankPopoutStandalone.qml
index 894d21d2..3f09c3f7 100644
--- a/quickshell/Widgets/DankPopoutStandalone.qml
+++ b/quickshell/Widgets/DankPopoutStandalone.qml
@@ -607,7 +607,7 @@ Item {
         WlrLayershell.namespace: root.layerNamespace
         WlrLayershell.layer: root.effectivePopoutLayer
         WlrLayershell.exclusiveZone: -1
-        WlrLayershell.keyboardFocus: KeyboardFocus.keyboardFocus(shouldBeVisible || isClosing, customKeyboardFocus)
+        WlrLayershell.keyboardFocus: KeyboardFocus.keyboardFocus(shouldBeVisible || (isClosing && CompositorService.useHyprlandFocusGrab), customKeyboardFocus)
 
         anchors {
             left: true