                      (when (eq file 'C-source)
                        (setq file (help-C-file-name var 'var)))
                      (let ((location (find-variable-noselect var file)))
-                       (switch-to-buffer-other-window (car location))
+                       (doom/popup-save
+                        (switch-to-buffer (car location)))
                        (if (cdr location)
                            (goto-char (cdr location))
                          (message "Unable to find location in file"))))

                       (setq file (help-C-file-name (indirect-function fun) 'fun)))
                     (let ((location
                            (find-function-search-for-symbol fun nil file)))
                       (switch-to-buffer-other-window (car location))
                       (if (cdr location)
                           (goto-char (cdr location))
                         (message "Unable to find location in file"))))

                     (require 'find-func)
                     (let ((location
                            (find-function-search-for-symbol fun 'defface file)))
                       (doom/popup-save
                        (switch-to-buffer (car location)))
                       (if (cdr location)
                           (goto-char (cdr location))
                         (message "Unable to find location in file"))))
