diff --git a/modules/ui/popup/autoload/popup.el b/modules/ui/popup/autoload/popup.el
index 0c5679706..0fed3647b 100644
--- a/modules/ui/popup/autoload/popup.el
+++ b/modules/ui/popup/autoload/popup.el
@@ -206,7 +206,8 @@ and enables `+popup-buffer-mode'."
         (when-let (popup (cl-loop for func in actions
                                   if (funcall func buffer alist)
                                   return it))
-          (+popup--init popup alist)
+          (with-current-buffer buffer
+            (+popup--init popup alist))
           (+popup--maybe-select-window popup origin)
           popup))))
 
diff --git a/modules/ui/popup/config.el b/modules/ui/popup/config.el
index 76fce31a6..c62d55e97 100644
--- a/modules/ui/popup/config.el
+++ b/modules/ui/popup/config.el
@@ -168,11 +168,11 @@ prevent the popup(s) from messing up the UI (or vice versa)."
 
 (add-hook 'doom-init-ui-hook #'+popup-mode 'append)
 
-(add-hook! '+popup-buffer-mode-hook
-           #'+popup-adjust-fringes-h
-           #'+popup-adjust-margins-h
-           #'+popup-set-modeline-on-enable-h
-           #'+popup-unset-modeline-on-disable-h)
+(add-hook '+popup-buffer-mode-hook #'+popup-set-modeline-on-enable-h)
+(add-hook '+popup-buffer-mode-hook #'+popup-unset-modeline-on-disable-h)
+
+(add-hook '+popup-create-window-hook #'+popup-adjust-fringes-h)
+(add-hook '+popup-create-window-hook #'+popup-adjust-margins-h)
 
 
 ;;