diff --git a/modules/app/calendar/autoload.el b/modules/app/calendar/autoload.el
index 81530ca5f..3aa68053d 100644
--- a/modules/app/calendar/autoload.el
+++ b/modules/app/calendar/autoload.el
@@ -21,7 +21,7 @@
         (+workspace/display))
     (setq +calendar--wconf (current-window-configuration))
     (delete-other-windows)
-    (doom/switch-to-scratch-buffer)
+    (switch-to-buffer (doom-fallback-buffer))
     (+calendar--init)))
 
 ;;;###autoload
diff --git a/modules/config/default/+emacs-bindings.el b/modules/config/default/+emacs-bindings.el
index cd14f0cdb..201a55890 100644
--- a/modules/config/default/+emacs-bindings.el
+++ b/modules/config/default/+emacs-bindings.el
@@ -52,10 +52,10 @@
 ;;; Leader keys
 
 (map! :leader
-      :desc "Find file in project"      "C-f" #'projectile-find-file
-      :desc "Evaluate line/region"      "e"   #'+eval/line-or-region
-      :desc "Pop up scratch buffer"     "x"   #'doom/open-to-scratch-buffer
-      :desc "Switch to scratch buffer"  "X"   #'doom/switch-to-scratch-buffer
+      :desc "Find file in project"        "C-f" #'projectile-find-file
+      :desc "Evaluate line/region"        "e"   #'+eval/line-or-region
+      :desc "Open scratch buffer"         "x"   #'doom/open-scratch-buffer
+      :desc "Open project scratch buffer" "X"   #'doom/open-project-scratch-buffer
 
       (:when (featurep! :emacs term)
         :desc "Terminal"              "`" #'+term/open