diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 237521ad4a0..31a8158e3a6 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1650,9 +1650,7 @@ see the doc of that variable if you want to add names to the list."
 (defun select-tags-table-quit ()
   "Kill the buffer and delete the selected window."
   (interactive)
-  (kill-buffer (current-buffer))
-  (or (one-window-p)
-      (delete-window)))
+  (quit-window t (selected-window)))
 
 ;;; Note, there is another definition of this function in bindings.el.
 ;;;###autoload