diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d463ba319..111aabe69 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-03-01  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-agenda.el (org-agenda-quit): Delete window only when the
+	frame-setup was not `current-window'.
+
 	* org.el (org-tag-persistent-alist): New option.
 	(org-startup-options): Add keyword `noptag'.
 	(org-fast-todo-selection): Handle :newline correctly.
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 3fb7baf17..dbfa5f66b 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -4455,7 +4455,9 @@ If ERROR is non-nil, throw an error, otherwise just return nil."
   (if org-agenda-columns-active
       (org-columns-quit)
     (let ((buf (current-buffer)))
-      (if (not (one-window-p)) (delete-window))
+      (and (not (eq org-agenda-window-setup 'current-window)) 
+           (not (one-window-p))
+           (delete-window))
       (kill-buffer buf)
       (org-agenda-reset-markers)
       (org-columns-remove-overlays)