From 7c936cacfbcafb2024055af1af3128f93e077f1d Mon Sep 17 00:00:00 2001
From: bbedward <bbedward@gmail.com>
Date: Sat, 10 Jan 2026 10:13:41 -0500
Subject: [PATCH] niri: fix effectiveScreenAssignment in modal

---
 quickshell/Modals/Common/DankModal.qml                       | 2 +-
 quickshell/Modules/WorkspaceOverlays/NiriOverviewOverlay.qml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/quickshell/Modals/Common/DankModal.qml b/quickshell/Modals/Common/DankModal.qml
index 71373eee..20a5322f 100644
--- a/quickshell/Modals/Common/DankModal.qml
+++ b/quickshell/Modals/Common/DankModal.qml
@@ -58,7 +58,6 @@ Item {
     property bool animationsEnabled: true
 
     function open() {
-        ModalManager.openModal(root);
         closeTimer.stop();
         const focusedScreen = CompositorService.getFocusedScreen();
         if (focusedScreen) {
@@ -66,6 +65,7 @@ Item {
             if (!useSingleWindow)
                 clickCatcher.screen = focusedScreen;
         }
+        ModalManager.openModal(root);
         shouldBeVisible = true;
         if (!useSingleWindow)
             clickCatcher.visible = true;
diff --git a/quickshell/Modules/WorkspaceOverlays/NiriOverviewOverlay.qml b/quickshell/Modules/WorkspaceOverlays/NiriOverviewOverlay.qml
index 6b3eff3f..e690637a 100644
--- a/quickshell/Modules/WorkspaceOverlays/NiriOverviewOverlay.qml
+++ b/quickshell/Modules/WorkspaceOverlays/NiriOverviewOverlay.qml
@@ -14,7 +14,7 @@ Scope {
     property bool isClosing: false
     property bool releaseKeyboard: false
     readonly property bool spotlightModalOpen: PopoutService.spotlightModal?.spotlightOpen ?? false
-    property bool overlayActive: (NiriService.inOverview && !spotlightModalOpen) || searchActive
+    property bool overlayActive: NiriService.inOverview || searchActive
 
     function showSpotlight(screenName) {
         isClosing = false;