diff --git a/core/core-eval.el b/core/core-eval.el
index 0abafbf38..bde870dd3 100644
--- a/core/core-eval.el
+++ b/core/core-eval.el
@@ -23,8 +23,8 @@
 
   (add-hook! repl-toggle-mode
     (evil-initialize-state 'emacs)
-    (setq mode-line-format nil
-          repl-p t))
+    (narf|hide-mode-line)
+    (setq repl-p t))
 
   :config
   (map! :map repl-toggle-mode-map
diff --git a/core/core-helm.el b/core/core-helm.el
index f7081cd7e..04b4cad43 100644
--- a/core/core-helm.el
+++ b/core/core-helm.el
@@ -65,7 +65,7 @@
 
   (defun narf*helm-hide-header (source &optional force)
     (setq header-line-format nil)
-    (setq mode-line-format nil))
+    (narf|hide-mode-line))
 
   (defun narf*helm-replace-prompt (plist)
     (if (keywordp (car plist))
diff --git a/core/core-popup.el b/core/core-popup.el
index 27ca45a2b..96285ff80 100644
--- a/core/core-popup.el
+++ b/core/core-popup.el
@@ -50,7 +50,7 @@
            :popup t :align below :size 16)))
 
   (after! ert
-    (add-hook! 'ert-results-mode-hook (setq mode-line-format nil))
+    (add-hook! 'ert-results-mode-hook 'narf|hide-mode-line)
     (map! (:map ert-results-mode-map
             [escape]   'quit-window
             "<escape>" 'quit-window)))
@@ -147,7 +147,7 @@
       (let ((window (get-buffer-window quickrun/buffer-name)))
         (with-selected-window window
           (narf|nlinum-enable)
-          (setq mode-line-format nil)
+          (narf|hide-mode-line)
           (let* ((lines (count-lines (point-min) (point-max)))
                  (act-lines (max 5 (min 30 lines))))
             (set-window-start window (evil-line-position (+ 2 (- lines act-lines))))
@@ -261,7 +261,7 @@
     (interactive)
     (narf/popup-buffer "*Messages*")
     (with-current-buffer "*Messages*"
-      (setq mode-line-format nil)
+      (narf|hide-mode-line)
       (goto-char (point-max)))))
 
 (provide 'core-popup)
diff --git a/core/core-ui.el b/core/core-ui.el
index 6e9f7edd8..685bea2e3 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -100,7 +100,9 @@
 (add-hook! evil-visual-state-exit  'narf|hl-line-on)
 
 ;; Hide modeline in help windows
-(add-hook! help-mode (setq-local mode-line-format nil))
+(defun narf|hide-mode-line ()
+  (setq-local mode-line-format nil))
+(add-hook! help-mode 'narf|hide-mode-line)
 
 ;; Highlight TODO/FIXME/NOTE tags
 (defface narf-todo-face  '((t (:inherit font-lock-warning-face))) "Face for TODOs")