diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 21ce5edc4..9cb0aa5a1 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-21  Bastien Guerry  <bzg@altern.org>
+
+	* org.el (org-eval-in-calendar): Fix a bug about calendar
+	navigation when `calendar-setup' value is 'calendar-only.
+
 2009-07-19  Bastien Guerry  <bzg@altern.org>
 
 	* org.el (orgstruct++-mode): Fix typo in docstring.
diff --git a/lisp/org.el b/lisp/org.el
index 545bb35d8..9b6a79381 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -12409,7 +12409,7 @@ DEF-FLAG   is t when a double ++ or -- indicates shift relative to
   "Eval FORM in the calendar window and return to current window.
 Also, store the cursor date in variable org-ans2."
   (let ((sw (selected-window)))
-    (select-window (get-buffer-window "*Calendar*"))
+    (select-window (get-buffer-window "*Calendar*" t))
     (eval form)
     (when (and (not keepdate) (calendar-cursor-to-date))
       (let* ((date (calendar-cursor-to-date))