           ("^ ?\\*" :regexp t :size 15 :noselect t :autokill t :autoclose t)))
 
   :config
-  (add-hook 'doom-post-init-hook #'shackle-mode)
+  ;; NOTE This is a temporary fix while I rewrite core-popups
+  (defun doom-display-buffer-condition (buffer _action)
+    (and (cl-loop for re in doom-popup-blacklist
+                  when (string-match-p re buffer)
+                  return nil
+                  finally return t)
+         (shackle-match buffer)))
+
+  (defun doom-display-buffer-action (buffer alist)
+    (shackle-display-buffer buffer alist (shackle-match buffer)))
+
+  (add-hook! doom-post-init
+    (setq display-buffer-alist
+          (cons '(doom-display-buffer-condition doom-display-buffer-action)
+                display-buffer-alist)))
 
   ;; no modeline in popups
   (add-hook 'doom-popup-mode-hook #'doom|hide-modeline-in-popup)

  (if (cl-every #'listp (mapcar #'doom-unquote rules))
      `(setq shackle-rules (nconc (list ,@rules) shackle-rules))
    `(push (list ,@rules) shackle-rules)))


;;



(after! magit
  (add-hook 'magit-mode-hook #'doom-hide-modeline-mode))


(after! mu4e
