diff --git a/README.md b/README.md
index 2055f836..30a2f103 100644
--- a/README.md
+++ b/README.md
@@ -127,7 +127,7 @@ require'nvim-tree'.setup {
   open_on_tab          = false,
   hijack_cursor        = false,
   update_cwd           = false,
-  hijack_unnamed_buffer_when_opening = true,
+  hijack_unnamed_buffer_when_opening = false,
   hijack_directories   = {
     enable = true,
     auto_open = true,
diff --git a/doc/nvim-tree-lua.txt b/doc/nvim-tree-lua.txt
index 52bbfd0f..4fde4420 100644
--- a/doc/nvim-tree-lua.txt
+++ b/doc/nvim-tree-lua.txt
@@ -84,7 +84,7 @@ function.
       open_on_tab          = false,
       hijack_cursor        = false,
       update_cwd           = false,
-      hijack_unnamed_buffer_when_opening = true,
+      hijack_unnamed_buffer_when_opening = false,
       diagnostics          = {
         enable = false,
         show_on_dirs = false,
@@ -188,7 +188,7 @@ Here is a list of the options available in the setup call:
 - |hijack_unnamed_buffer_when_opening|: opens in place of the unnamed
   buffer if it's empty.
   type: `boolean`
-  default: `true`
+  default: `false`
 
 *nvim-tree.hijack_directories*
 - |hijack_directories|: hijacks new directory buffers when they are opened (`:e dir`).
diff --git a/lua/nvim-tree.lua b/lua/nvim-tree.lua
index 99a50557..c5830755 100644
--- a/lua/nvim-tree.lua
+++ b/lua/nvim-tree.lua
@@ -290,7 +290,7 @@ local DEFAULT_OPTS = {
   hijack_cursor        = false,
   update_cwd           = false,
   hide_root_folder     = false,
-  hijack_unnamed_buffer_when_opening = true,
+  hijack_unnamed_buffer_when_opening = false,
   update_focused_file  = {
     enable = false,
     update_cwd = false,
diff --git a/lua/nvim-tree/lib.lua b/lua/nvim-tree/lib.lua
index 37149679..38ced88b 100644
--- a/lua/nvim-tree/lib.lua
+++ b/lua/nvim-tree/lib.lua
@@ -129,6 +129,7 @@ function M.open(cwd)
   local bufnr = api.nvim_get_current_buf()
   if M.hijack_unnamed_buffer_when_opening
     and api.nvim_buf_get_name(bufnr) == ""
+    and not api.nvim_buf_get_option(bufnr, "modified")
     and api.nvim_buf_get_option(bufnr, "ft") == "" then
     view.open_in_current_win()
     renderer.draw()