diff --git a/lua/nvim-tree/actions/init.lua b/lua/nvim-tree/actions/init.lua
index 775e09c7..2e2f1279 100644
--- a/lua/nvim-tree/actions/init.lua
+++ b/lua/nvim-tree/actions/init.lua
@@ -77,7 +77,7 @@ local keypress_funcs = {
   prev_git_item = go_to('prev_git_item'),
   next_git_item = go_to('next_git_item'),
   dir_up = lib.dir_up,
-  close = function() M.close() end,
+  close = function() require'nvim-tree'.close() end,
   preview = function(node)
     if node.name == '..' then
       return
@@ -173,7 +173,7 @@ function M.setup(opts)
   local user_map_config = (opts.view or {}).mappings or {}
   local options = vim.tbl_deep_extend('force', DEFAULT_MAPPING_CONFIG, user_map_config)
   if options.custom_only then
-    M.mappings = options.mappings.list
+    M.mappings = options.list
   else
     M.mappings = merge_mappings(options.list)
   end
diff --git a/lua/nvim-tree/renderer/help.lua b/lua/nvim-tree/renderer/help.lua
index d98afd90..1ad1ded6 100644
--- a/lua/nvim-tree/renderer/help.lua
+++ b/lua/nvim-tree/renderer/help.lua
@@ -5,22 +5,23 @@ function M.compute_lines()
   local help_lines = {'HELP'}
   local help_hl = {{'NvimTreeRootFolder', 0, 0, #help_lines[1]}}
   local mappings = vim.tbl_filter(function(v)
-    return v.cb ~= nil and v.cb ~= ""
-  end, view.View.mappings)
+    return (v.cb ~= nil and v.cb ~= "") or (v.action ~= nil and v.action ~= "")
+  end, require'nvim-tree.actions'.mappings)
   local processed = {}
   for _, b in pairs(mappings) do
     local cb = b.cb
     local key = b.key
     local name
-    if cb:sub(1,35) == view.nvim_tree_callback('test'):sub(1,35) then
+    if cb and cb:sub(1,35) == require'nvim-tree.config'.nvim_tree_callback('test'):sub(1,35) then
       name = cb:match("'[^']+'[^']*$")
       name = name:match("'[^']+'")
-      table.insert(processed, {key, name, true})
+    elseif b.action then
+      name = b.action
     else
       name = (b.name ~= nil) and b.name or cb
       name = '"' .. name .. '"'
-      table.insert(processed, {key, name, false})
     end
+    table.insert(processed, {key, name, true})
   end
   table.sort(processed, function(a,b)
     return (a[3] == b[3]