diff --git a/lua/nvim-tree/renderer.lua b/lua/nvim-tree/renderer.lua
index 3f03577a..85a2b9c8 100644
--- a/lua/nvim-tree/renderer.lua
+++ b/lua/nvim-tree/renderer.lua
@@ -455,9 +455,6 @@ function M.draw(tree, reload)
   if cursor and #lines >= cursor[1] then
     api.nvim_win_set_cursor(view.get_winnr(), cursor)
   end
-  if cursor then
-    api.nvim_win_set_option(view.get_winnr(), 'wrap', false)
-  end
 end
 
 function M.render_hl(bufnr)
diff --git a/lua/nvim-tree/view.lua b/lua/nvim-tree/view.lua
index 7a089e72..958b3208 100644
--- a/lua/nvim-tree/view.lua
+++ b/lua/nvim-tree/view.lua
@@ -24,6 +24,7 @@ M.View = {
     foldcolumn = '0',
     cursorcolumn = false,
     colorcolumn = '0',
+    wrap = false,
     winhl = table.concat({
       'EndOfBuffer:NvimTreeEndOfBuffer',
       'Normal:NvimTreeNormal',