diff --git a/lua/nvim-tree/actions/node/open-file.lua b/lua/nvim-tree/actions/node/open-file.lua
index afa3af96a69..683b5fdb960 100644
--- a/lua/nvim-tree/actions/node/open-file.lua
+++ b/lua/nvim-tree/actions/node/open-file.lua
@@ -79,13 +79,18 @@ local function pick_win_id()
   local laststatus = vim.o.laststatus
   vim.o.laststatus = 2
   local fillchars = vim.opt.fillchars:get()
-  local stl = fillchars.stl
-  local stlnc = fillchars.stlnc
+  local stl = fillchars and fillchars.stl
+  local stlnc = fillchars and fillchars.stlnc
   fillchars.stl = nil
   fillchars.stlnc = nil
+
+  --- TODO see #3357 - Option:remove and Option:append should be used instead of directly assigning to the Option
+  ---@diagnostic disable-next-line: assign-type-mismatch
   vim.opt.fillchars = fillchars
-  fillchars.stl = stl
-  fillchars.stlnc = stlnc
+  if fillchars then
+    fillchars.stl = stl
+    fillchars.stlnc = stlnc
+  end
 
   local tabpage = vim.api.nvim_get_current_tabpage()
   local win_ids = vim.api.nvim_tabpage_list_wins(tabpage)
diff --git a/lua/nvim-tree/actions/tree/collapse.lua b/lua/nvim-tree/actions/tree/collapse.lua
index b0611e21789..fb3ad89ae8e 100644
--- a/lua/nvim-tree/actions/tree/collapse.lua
+++ b/lua/nvim-tree/actions/tree/collapse.lua
@@ -9,6 +9,7 @@ local M = {}
 
 ---@return fun(path: string): boolean
 local function buf_match()
+  ---@type string[]
   local buffer_paths = vim.tbl_map(function(buffer)
     return vim.api.nvim_buf_get_name(buffer)
   end, vim.api.nvim_list_bufs())
diff --git a/lua/nvim-tree/marks/init.lua b/lua/nvim-tree/marks/init.lua
index c3510b05ba8..d68e4a98a58 100644
--- a/lua/nvim-tree/marks/init.lua
+++ b/lua/nvim-tree/marks/init.lua
@@ -349,6 +349,7 @@ end
 ---A folder will be focused, a file will be opened.
 ---@public
 function Marks:navigate_select()
+  ---@type string[]
   local list = vim.tbl_map(function(n)
     return n.absolute_path
   end, self:list())