diff --git a/frontend/ui/screensaver.lua b/frontend/ui/screensaver.lua
index ac029258f..3ff9d33c3 100644
--- a/frontend/ui/screensaver.lua
+++ b/frontend/ui/screensaver.lua
@@ -85,7 +85,7 @@ function Screensaver:show()
     DEBUG("show screensaver")
     local InfoMessage = require("ui/widget/infomessage")
     -- first check book cover image
-    screen_saver_last_book =
+    local screen_saver_last_book =
         G_reader_settings:readSetting("use_lastfile_as_screensaver")
     if screen_saver_last_book == nil or screen_saver_last_book then
         local lastfile = G_reader_settings:readSetting("lastfile")
diff --git a/frontend/ui/widget/filechooser.lua b/frontend/ui/widget/filechooser.lua
index 641c1c09e..9d6cb0c32 100644
--- a/frontend/ui/widget/filechooser.lua
+++ b/frontend/ui/widget/filechooser.lua
@@ -103,11 +103,12 @@ function FileChooser:genItemTableFromPath(path)
 
     local item_table = {}
     for i, dir in ipairs(dirs) do
-        local dirs = {}
-        local files = {}
+        -- count sume of directories and files inside dir
+        local sub_dirs = {}
+        local dir_files = {}
         local subdir_path = self.path.."/"..dir.name
-        self.list(subdir_path, dirs, files)
-        local items = #dirs + #files
+        self.list(subdir_path, sub_dirs, dir_files)
+        local items = #sub_dirs + #dir_files
         local istr = util.template(
             items == 1 and _("1 item")
             or _("%1 items"), items)