diff --git a/modules/app/calendar/autoload.el b/modules/app/calendar/autoload.el
index fc99aea38..7d906c4cb 100644
--- a/modules/app/calendar/autoload.el
+++ b/modules/app/calendar/autoload.el
@@ -7,9 +7,11 @@
   (unless (featurep! :feature workspaces)
     (user-error ":feature workspaces is required, but disabled"))
   (+workspace-switch "Calendar" t)
-  (if-let* ((buf (cl-find-if (lambda (it) (string-match-p "^\\*cfw" (buffer-name (window-buffer it))))
-                             (doom-visible-windows))))
-      (select-window (get-buffer-window buf)) (call-interactively +calendar-open-calendar-function))
+  (if-let* ((win (cl-loop for win in (doom-visible-windows)
+                          if (string-match-p "^\\*cfw" (buffer-name (window-buffer it)))
+                          return win)))
+      (select-window win)
+    (call-interactively +calendar-open-function))
   (+workspace/display))
 
 ;;;###autoload
diff --git a/modules/app/calendar/config.el b/modules/app/calendar/config.el
index 3870ca701..7865412e2 100644
--- a/modules/app/calendar/config.el
+++ b/modules/app/calendar/config.el
@@ -4,7 +4,7 @@
   (expand-file-name "private/org/secret.el" doom-modules-dir)
   "TODO")
 
-(defvar +calendar-open-calendar-function #'+calendar/open-calendar
+(defvar +calendar-open-function #'+calendar/open-calendar
   "TODO")