diff --git a/unravel-emacs.org b/unravel-emacs.org
index ef9c7d6..8108a37 100644
--- a/unravel-emacs.org
+++ b/unravel-emacs.org
@@ -4368,7 +4368,7 @@ title of the task, and the like. The documentation string of
     (setq org-agenda-show-all-dates t)
     (setq org-agenda-show-outline-path nil)
     ;; Show me only the Agenda window when I ask for Agenda
-    (setq org-agenda-window-setup 'other-frame)
+    (setq org-agenda-window-setup 'only-window)
     (setq org-agenda-skip-comment-trees t)
     (setq org-agenda-menu-show-matcher t)
     (setq org-agenda-menu-two-columns nil)
diff --git a/unravel-modules/unravel-org.el b/unravel-modules/unravel-org.el
index 25a8369..1ba8b7b 100644
--- a/unravel-modules/unravel-org.el
+++ b/unravel-modules/unravel-org.el
@@ -405,7 +405,7 @@ If WEEK-NUM is not provided, use the current week."
   (setq org-agenda-show-all-dates t)
   (setq org-agenda-show-outline-path nil)
   ;; Show me only the Agenda window when I ask for Agenda
-  (setq org-agenda-window-setup 'other-frame)
+  (setq org-agenda-window-setup 'only-window)
   (setq org-agenda-skip-comment-trees t)
   (setq org-agenda-menu-show-matcher t)
   (setq org-agenda-menu-two-columns nil)