diff --git a/TODO.org b/TODO.org
index 831349610..e4d2b3748 100644
--- a/TODO.org
+++ b/TODO.org
@@ -1,11 +1,11 @@
 #+TITLE: DOOM Emacs Changelog
 
-** Unreleased [38/52]
+** Unreleased [39/52]
 + [-] app/finance
 + [-] app/crm
 + [-] Improve send-to-REPL workflow
 + [ ] Update screenshots
-+ [ ] Fix lack of syntax highlighting in ~:x~ scratch buffer
++ [X] Fix lack of syntax highlighting in ~:x~ scratch buffer
 + [X] Fix modeline disappearing due to loss of state (~doom--modeline-format~ being killed on major mode change)
 + [0/4] Investigate potential plugins
   + [ ] feature/version-control: [[https://github.com/pidu/git-timemachine][git-timemachine]] (replacement for vc-annotate)
diff --git a/modules/ui/doom/autoload/evil.el b/modules/ui/doom/autoload/evil.el
index 47cce100e..4b8a5e128 100644
--- a/modules/ui/doom/autoload/evil.el
+++ b/modules/ui/doom/autoload/evil.el
@@ -11,13 +11,14 @@ use the current window."
                 (buffer-substring beg end)))
         (mode major-mode)
         (old-project (doom-project-root))
-        (new-buf (get-buffer-create " *doom:scratch*")))
+      (new-buf (get-buffer-create "*doom:scratch*")))
+    (if bang
+        (switch-to-buffer new-buf)
+      (doom-popup-buffer new-buf))
     (with-current-buffer new-buf
-      (setq default-directory old-project
-            mode-line-format (doom-modeline 'minimal))
+      (setq default-directory old-project)
       (when (and (not (eq major-mode mode))
                  (functionp mode))
         (funcall mode))
-      (if text (insert text)))
-    (if bang (switch-to-buffer new-buf) (doom-popup-buffer new-buf))))
+      (if text (insert text)))))