diff --git a/lua/nvim-tree/actions/open-file.lua b/lua/nvim-tree/actions/open-file.lua
index 806a498b..97c5164a 100644
--- a/lua/nvim-tree/actions/open-file.lua
+++ b/lua/nvim-tree/actions/open-file.lua
@@ -147,8 +147,8 @@ function M.fn(mode, filename)
   end
 
   if mode == "edit_in_place" then
-    vim.cmd("edit " .. vim.fn.fnameescape(filename))
     require"nvim-tree.view".abandon_current_window()
+    vim.cmd("edit " .. vim.fn.fnameescape(filename))
     return
   end
 
diff --git a/lua/nvim-tree/view.lua b/lua/nvim-tree/view.lua
index ffdaec17..fad56eec 100644
--- a/lua/nvim-tree/view.lua
+++ b/lua/nvim-tree/view.lua
@@ -210,6 +210,7 @@ end
 
 function M.abandon_current_window()
   local tab = a.nvim_get_current_tabpage()
+  BUFNR = nil
   M.View.tabpages[tab] = { winnr = nil }
 end