diff --git a/modules/tools/eval/config.el b/modules/tools/eval/config.el
index b2ee708ed..5f07e9545 100644
--- a/modules/tools/eval/config.el
+++ b/modules/tools/eval/config.el
@@ -25,14 +25,15 @@
 
   (defun +eval|quickrun-shrink-window ()
     "Shrink the quickrun output window once code evaluation is complete."
-    (with-selected-window (get-buffer-window quickrun--buffer-name)
-      (let ((ignore-window-parameters t))
-        (shrink-window-if-larger-than-buffer))))
+    (when-let* ((win (get-buffer-window quickrun--buffer-name)))
+      (with-selected-window (get-buffer-window quickrun--buffer-name)
+        (let ((ignore-window-parameters t))
+          (shrink-window-if-larger-than-buffer)))))
   (add-hook 'quickrun-after-run-hook #'+eval|quickrun-shrink-window)
 
   (defun +eval|quickrun-scroll-to-bof ()
     "Ensures window is scrolled to BOF on invocation."
-    (with-selected-window (get-buffer-window quickrun--buffer-name)
-      (goto-char (point-min))))
+    (when-let* ((win (get-buffer-window quickrun--buffer-name)))
+      (with-selected-window win
+        (goto-char (point-min)))))
   (add-hook 'quickrun-after-run-hook #'+eval|quickrun-scroll-to-bof))
-