diff --git a/modules/ui/popup/autoload/popup.el b/modules/ui/popup/autoload/popup.el
index 4c28b97b1..34279daea 100644
--- a/modules/ui/popup/autoload/popup.el
+++ b/modules/ui/popup/autoload/popup.el
@@ -181,8 +181,7 @@ and enables `+popup-buffer-mode'."
     (let ((window (or window (selected-window))))
       (and (windowp window)
            (window-live-p window)
-           (or (window-parameter window 'popup)
-               (window-parameter window 'no-other-window))
+           (window-parameter window 'popup)
            window))))
 
 ;;;###autoload
diff --git a/modules/ui/treemacs/config.el b/modules/ui/treemacs/config.el
index fe1535440..ba969ea33 100644
--- a/modules/ui/treemacs/config.el
+++ b/modules/ui/treemacs/config.el
@@ -8,12 +8,6 @@
 
 
 (after! treemacs
-  (set-popup-rule! "^ \\*Treemacs"
-    :side treemacs-position
-    :size treemacs-width
-    :quit nil
-    :ttl 0)
-
   ;; Don't follow the cursor
   (treemacs-follow-mode -1)