diff --git a/lisp/org-mks.el b/lisp/org-mks.el
index abf5e79..6700fa2 100644
--- a/lisp/org-mks.el
+++ b/lisp/org-mks.el
@@ -54,9 +54,10 @@ also (\"key\" \"description\") entries.  When they are selected,
 "
   (setq prompt (or prompt "Select: "))
   (let (tbl orig-table dkey ddesc des-keys allowed-keys
-	    current prefix rtn re pressed)
+	    current prefix rtn re pressed buffer)
+    (unwind-protect
     (save-window-excursion
-      (org-switch-to-buffer-other-window "*Org Select*")
+      (setq buffer (org-switch-to-buffer-other-window "*Org Select*"))
       (setq orig-table table)
       (catch 'exit
 	(while t
@@ -121,7 +122,7 @@ also (\"key\" \"description\") entries.  When they are selected,
 			   nil))
 		       table))
 	  (setq table (remove nil table)))))
-    (kill-buffer "*Org Select*")
+    (when buffer (kill-buffer "*Org Select*")))
     rtn))
 
 (provide 'org-mks)