diff --git a/autoload/zvim/util.vim b/autoload/zvim/util.vim
index 07ee0da79..7be33f3cb 100644
--- a/autoload/zvim/util.vim
+++ b/autoload/zvim/util.vim
@@ -187,7 +187,7 @@ endfunction
 
 function! zvim#util#OpenVimfiler() abort
     if bufnr('vimfiler') == -1
-        VimFiler
+        silent VimFiler
         if exists(':AirlineRefresh')
             AirlineRefresh
         endif
@@ -198,7 +198,7 @@ function! zvim#util#OpenVimfiler() abort
         endif
         wincmd p
     else
-        VimFiler
+        silent VimFiler
         doautocmd WinEnter
         if exists(':AirlineRefresh')
             AirlineRefresh
diff --git a/config/plugins/vimfiler.vim b/config/plugins/vimfiler.vim
index 24c96b057..9a8f1a680 100644
--- a/config/plugins/vimfiler.vim
+++ b/config/plugins/vimfiler.vim
@@ -79,14 +79,16 @@ function! s:vimfilerinit()
   nnoremap <silent><buffer><expr> sg  vimfiler#do_action('vsplit')
   nnoremap <silent><buffer><expr> sv  vimfiler#do_action('split')
   nnoremap <silent><buffer><expr> st  vimfiler#do_action('tabswitch')
-  nmap <buffer> gx     <Plug>(vimfiler_execute_vimfiler_associated)
-  nmap <buffer> '      <Plug>(vimfiler_toggle_mark_current_line)
-  nmap <buffer> v      <Plug>(vimfiler_quick_look)
-  nmap <buffer> p      <Plug>(vimfiler_preview_file)
-  nmap <buffer> V      <Plug>(vimfiler_clear_mark_all_lines)
-  nmap <buffer> i      <Plug>(vimfiler_switch_to_history_directory)
-  nmap <buffer> <Tab>  <Plug>(vimfiler_switch_to_other_window)
-  nmap <buffer> <C-r>  <Plug>(vimfiler_redraw_screen)
+  nmap <buffer> gx      <Plug>(vimfiler_execute_vimfiler_associated)
+  nmap <buffer> '       <Plug>(vimfiler_toggle_mark_current_line)
+  nmap <buffer> v       <Plug>(vimfiler_quick_look)
+  nmap <buffer> p       <Plug>(vimfiler_preview_file)
+  nmap <buffer> V       <Plug>(vimfiler_clear_mark_all_lines)
+  nmap <buffer> i       <Plug>(vimfiler_switch_to_history_directory)
+  nmap <buffer> <Tab>   <Plug>(vimfiler_switch_to_other_window)
+  nmap <buffer> <C-r>   <Plug>(vimfiler_redraw_screen)
+  nmap <buffer> <Left>  <Plug>(vimfiler_smart_h)
+  nmap <buffer> <Right> <Plug>(vimfiler_smart_l)
 endf
 
 " vim:set et sw=2:
diff --git a/docs/documentation.md b/docs/documentation.md
index 7bf4a25f8..519f5e7b6 100644
--- a/docs/documentation.md
+++ b/docs/documentation.md
@@ -827,13 +827,14 @@ Key Binding | Description
 -----------| -----------
 `<F3>` or `SPC f t` | Toggle file explorer
 | **Within _VimFiler_ buffers** | |
-`h` or `RET`        | go to parent node and collapse expanded directory
+`<Left>` or `h`     | go to parent node and collapse expanded directory
 `<Down>` or `j`     | select next file or directory
 `<Up>` or `k`       | select previous file or directory
-`l`                 | open selected file or expand directory
+`<Right>` or `l`    | open selected file or expand directory
 `Ctrl`+`j`          | Un-map
 `Ctrl`+`l`          | Un-map
 `E`                 | Un-map
+`.`                 | toggle visible ignored files
 `sv`                | Split edit
 `sg`                | Vertical split edit
 `p`                 | Preview
@@ -846,7 +847,13 @@ Key Binding | Description
 
 ##### Open file with file tree.
 
-By default a file is opened in the last active window, 
+If there is only one file buffer opened, a file is opened in the active window, otherwise we need to use vim-choosewin to select a window to open the file.
+
+Key Binding | Description
+-----------| -----------
+`l` or `Enter` | open file in one window
+`sg` | open file in an vertically split window
+`sv` | open file in an horizontally split window
 
 ### Auto-saving