diff --git a/core/autoload/buffers.el b/core/autoload/buffers.el
index f60b35c15..95439f3a5 100644
--- a/core/autoload/buffers.el
+++ b/core/autoload/buffers.el
@@ -23,18 +23,18 @@ the buffer (if narrowed).
 Inspired from http://demonastery.org/2013/04/emacs-evil-narrow-region/"
   (interactive "r")
   (if (region-active-p)
-    (progn
-      (deactivate-mark)
-      (when clone-p
-        (let ((old-buf (current-buffer)))
-          (switch-to-buffer (clone-indirect-buffer nil nil))
-          (setq doom-buffer--narrowed-origin old-buf)))
-      (narrow-to-region beg end))
-    (if doom-buffer--narrowed-origin
       (progn
-        (kill-this-buffer)
-        (switch-to-buffer doom-buffer--narrowed-origin)
-        (setq doom-buffer--narrowed-origin nil))
+        (deactivate-mark)
+        (when clone-p
+          (let ((old-buf (current-buffer)))
+            (switch-to-buffer (clone-indirect-buffer nil nil))
+            (setq doom-buffer--narrowed-origin old-buf)))
+        (narrow-to-region beg end))
+    (if doom-buffer--narrowed-origin
+        (progn
+          (kill-this-buffer)
+          (switch-to-buffer doom-buffer--narrowed-origin)
+          (setq doom-buffer--narrowed-origin nil))
       (widen))))
 
 
diff --git a/modules/feature/workspaces/config.el b/modules/feature/workspaces/config.el
index 884b3a119..451038c4f 100644
--- a/modules/feature/workspaces/config.el
+++ b/modules/feature/workspaces/config.el
@@ -43,7 +43,6 @@
   (advice-add 'switch-to-buffer :after '+workspaces*auto-add-buffer)
   (advice-add 'display-buffer   :after '+workspaces*auto-add-buffer)
 
-  ;; TODO Integration with projectile?
   ;; Create a new workspace on project switch
   (defun doom|new-workspace-on-project-change ()
     (let ((project-name (projectile-project-name)))
diff --git a/modules/ui/doom-dashboard/config.el b/modules/ui/doom-dashboard/config.el
index 881e86e5a..25401eafe 100644
--- a/modules/ui/doom-dashboard/config.el
+++ b/modules/ui/doom-dashboard/config.el
@@ -46,9 +46,9 @@
 (add-hook! 'kill-buffer-query-functions
    (if (not (+doom-dashboard-p))
        t
-     (ignore-errors (+doom-dashboard-force-reload))
-     (bury-buffer)
-     nil))
+     (ignore
+      (ignore-errors (+doom-dashboard-force-reload))
+      (bury-buffer))))
 (add-hook! 'window-setup-hook
   (add-hook 'window-configuration-change-hook '+doom-dashboard-reload)
   (+doom-dashboard-reload))
@@ -79,10 +79,9 @@
   "Erase the buffer and prepare it to be used like a normal buffer."
   (unless +doom-dashboard-edited-p
     (erase-buffer)
-    ;; (set-window-margins (get-buffer-window (doom-fallback-buffer)) 0 0)
     (setq +doom-dashboard-edited-p t
-          mode-line-format +doom-dashboard-old-modeline)
-    (setq fringe-indicator-alist +doom-dashboard--old-fringe-indicator)
+          mode-line-format +doom-dashboard-old-modeline
+          fringe-indicator-alist +doom-dashboard--old-fringe-indicator)
     (remove-hook 'evil-insert-state-entry-hook 'doom|mode-erase-on-insert t)))
 
 (defun +doom-dashboard-deferred-reload (&rest _)