diff --git a/modules/ui/popup/+hacks.el b/modules/ui/popup/+hacks.el
index b9af549fd..9fd624ee7 100644
--- a/modules/ui/popup/+hacks.el
+++ b/modules/ui/popup/+hacks.el
@@ -236,6 +236,7 @@ the command buffer."
               org-capture-place-template
               org-export--dispatch-ui
               org-agenda-get-restriction-and-command
+              org-goto-location
               org-fast-tag-selection
               org-fast-todo-selection)
     (if +popup-mode
@@ -244,6 +245,21 @@ the command buffer."
           (apply orig-fn args))
       (apply orig-fn args)))
 
+  (defadvice! +popup--org-fix-goto-a (orig-fn &rest args)
+    "`org-goto' uses `with-output-to-temp-buffer' to display its help buffer,
+for some reason, which is very unconventional, and so requires these gymnastics
+to tame (i.e. to get the popup manager to handle it)."
+    :around #'org-goto-location
+    (if +popup-mode
+        (letf! (defun internal-temp-output-buffer-show (buffer)
+                 (let ((temp-buffer-show-function
+                        (doom-rpartial #'+popup-display-buffer-stacked-side-window-fn nil)))
+                   (with-current-buffer buffer
+                     (hide-mode-line-mode +1))
+                   (funcall internal-temp-output-buffer-show buffer)))
+          (apply orig-fn args))
+      (apply orig-fn args)))
+
   (defadvice! +popup--org-fix-popup-window-shrinking-a (orig-fn &rest args)
     "Hides the mode-line in *Org tags* buffer so you can actually see its
 content and displays it in a side window without deleting all other windows.