diff --git a/modules/tools/neotree/autoload.el b/modules/tools/neotree/autoload.el
index bfd105158..8dc6baaf4 100644
--- a/modules/tools/neotree/autoload.el
+++ b/modules/tools/neotree/autoload.el
@@ -8,9 +8,9 @@
         (project-root (doom-project-root)))
     (require 'neotree)
     (cond ((and (neo-global--window-exists-p)
-                (window-live-p neo-global--buffer)
-                (eq (current-buffer) neo-global--buffer))
-           (neotree-hide))
+                (get-buffer-window neo-buffer-name t))
+           (neotree-hide)
+           (neotree-find path project-root))
           ((not (and (neo-global--window-exists-p)
                      (equal (file-truename (neo-global--with-buffer neo-buffer--start-node))
                             (file-truename project-root))))