diff --git a/lua/nvim-tree.lua b/lua/nvim-tree.lua
index 4800ab1af9d..063da8f11f3 100644
--- a/lua/nvim-tree.lua
+++ b/lua/nvim-tree.lua
@@ -41,6 +41,7 @@ end
 function M.open(cwd)
   cwd = cwd ~= "" and cwd or nil
   if view.is_visible() then
+    lib.set_target_win()
     view.focus()
   else
     lib.open(cwd)