diff --git a/modules/home/users/msyds/emacs/lisp/syd/popups.el b/modules/home/users/msyds/emacs/lisp/syd/popups.el
index 672c324..8d1b593 100755
--- a/modules/home/users/msyds/emacs/lisp/syd/popups.el
+++ b/modules/home/users/msyds/emacs/lisp/syd/popups.el
@@ -37,6 +37,12 @@
           (popper-close-latest)
         (while popper-open-popup-alist
           (popper-close-latest)))))
+  (syd-add-hook 'kill-buffer-hook
+    (defun syd-popups--kill-buffer-hook-h ()
+      "Delete the window of a killed popup buffer."
+      (when-let* ((window (get-buffer-window)))
+	(when (eq popper-popup-status 'popup)
+	  (delete-window window)))))
   (add-hook 'syd-new-popup-hook #'hide-mode-line-mode))
 
 (provide 'syd/popups)