diff --git a/lua/nvim-tree/lib.lua b/lua/nvim-tree/lib.lua
index 8ad11095..15fea88e 100644
--- a/lua/nvim-tree/lib.lua
+++ b/lua/nvim-tree/lib.lua
@@ -250,6 +250,8 @@ function M.open_file(mode, filename)
     ecmd()
   end
 
+  view.resize()
+
   if mode == 'preview' then
     if not found then M.set_target_win() end
     view.focus()
@@ -264,8 +266,6 @@ function M.open_file(mode, filename)
     view.close()
   end
 
-  view.resize()
-
   renderer.draw(M.Tree, true)
 end
 
diff --git a/lua/nvim-tree/view.lua b/lua/nvim-tree/view.lua
index 028023a4..088d44cc 100644
--- a/lua/nvim-tree/view.lua
+++ b/lua/nvim-tree/view.lua
@@ -113,7 +113,7 @@ function M.setup()
   end
 
   for k, v in pairs(M.View.bufopts) do
-    a.nvim_buf_set_option(M.View.bufnr, k, v)
+    vim.bo[M.View.bufnr][k] = v
   end
 
   if vim.g.nvim_tree_disable_keybindings ~= 1 then
@@ -205,7 +205,7 @@ function M.open()
   local winnr = a.nvim_get_current_win()
   M.View.tabpages[a.nvim_get_current_tabpage()] = winnr
   for k, v in pairs(M.View.winopts) do
-    a.nvim_win_set_option(winnr, k, v)
+    vim.wo[winnr][k] = v
   end
 
   vim.cmd("buffer "..M.View.bufnr)