diff --git a/lua/lib/tree.lua b/lua/lib/tree.lua
index 25bb5590..f6b07333 100644
--- a/lua/lib/tree.lua
+++ b/lua/lib/tree.lua
@@ -125,8 +125,10 @@ function M.refresh_tree()
     git.reload_roots()
     refresh_git(M.Tree)
   end
-  if M.Tree.winnr ~= nil then
+  if M.win_open() then
     renderer.draw(M.Tree, true)
+  else
+    M.Tree.loaded = false
   end
 end
 
@@ -165,12 +167,14 @@ function M.set_index_and_redraw(fname)
   end
 
   local index = iter(M.Tree.entries)
+  if not M.win_open() then
+    M.Tree.loaded = false
+    return
+  end
   renderer.draw(M.Tree, reload)
   if index then
     api.nvim_win_set_cursor(M.Tree.winnr, {index, 0})
   end
-
-  return index
 end
 
 function M.open_file(mode, filename)
diff --git a/lua/tree.lua b/lua/tree.lua
index 2840a7fe..38614b89 100644
--- a/lua/tree.lua
+++ b/lua/tree.lua
@@ -83,7 +83,6 @@ local function is_file_readable(fname)
 end
 
 local function find_file()
-  if not tree.win_open() then return end
   local bufname = api.nvim_buf_get_name(api.nvim_get_current_buf())
   if not is_file_readable(bufname) then return end