diff --git a/lisp/org.el b/lisp/org.el
index 29c985672..d64b15477 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -8781,8 +8781,8 @@ there is one, return it."
 				    (match-string 1 l)))))))
 	     (org-fit-window-to-buffer (get-buffer-window "*Select Link*"))
 	     (message "Select link to open, RET to open all:")
-	     (setq c (read-char-exclusive))
-	     (and (get-buffer "*Select Link*") (kill-buffer "*Select Link*"))))
+             (unwind-protect (setq c (read-char-exclusive))
+	       (and (get-buffer "*Select Link*") (kill-buffer "*Select Link*")))))
 	 (when (equal c ?q) (user-error "Abort"))
 	 (if (equal c ?\C-m)
 	     (setq link links)