diff --git a/lua/nvim-tree.lua b/lua/nvim-tree.lua
index 6a701f9e..086442ff 100644
--- a/lua/nvim-tree.lua
+++ b/lua/nvim-tree.lua
@@ -102,11 +102,11 @@ function M.on_keypress(mode)
   end
 
   if node.link_to and not node.entries then
-    lib.open_file(mode, node.relative_path)
+    lib.open_file(mode, utils.path_relative(node.absolute_path, vim.fn.getcwd(-1, 0)))
   elseif node.entries ~= nil then
     lib.unroll_dir(node)
   else
-    lib.open_file(mode, node.relative_path)
+    lib.open_file(mode, utils.path_relative(node.absolute_path, vim.fn.getcwd(-1, 0)))
   end
 end
 
@@ -148,16 +148,13 @@ end
 function M.find_file(with_open)
   local bufname = vim.fn.bufname()
   local filepath = vim.fn.fnamemodify(bufname, ':p')
+  if not is_file_readable(filepath) or vim.fn.isdirectory(filepath) == 1 then return end
 
   if with_open then
     M.open()
     view.focus()
-    if not is_file_readable(filepath) then return end
-    lib.set_index_and_redraw(filepath)
-    return
   end
 
-  if not is_file_readable(filepath) then return end
   lib.set_index_and_redraw(filepath)
 end