diff --git a/autoload/SpaceVim/mapping.vim b/autoload/SpaceVim/mapping.vim
index 433ac7ca4..ef438a053 100644
--- a/autoload/SpaceVim/mapping.vim
+++ b/autoload/SpaceVim/mapping.vim
@@ -41,13 +41,20 @@ function! SpaceVim#mapping#def(type, key, value, ...) abort
     if a:0 == 3
       " enable guide
       if a:key =~? '^<leader>'
-        let group = get(g:, 'mapleader', '\')
-        if !has_key(g:_spacevim_mappings, group)
-          let g:_spacevim_mappings[group] = {'name': 'new group'}
+        if len(a:key) > 9
+          let group = a:key[8:8]
+          if !has_key(g:_spacevim_mappings, group)
+            let g:_spacevim_mappings[group] = {'name': 'new group'}
+          endif
+          call extend(g:_spacevim_mappings[group], {
+                \ a:key[8:] : ['call feedkeys(' . gexe . ')', a:3]
+                \ })
+        elseif len(a:key) == 9
+          call extend(g:_spacevim_mappings, {
+                \ a:key[8:] : ['call feedkeys("' . gexe . '")', a:3]
+                \ })
+
         endif
-        call extend(g:_spacevim_mappings[group], {
-              \ a:key[8:] : ['call feedkeys(' . gexe . ')', a:3]
-              \ })
       endif
     endif
   endif
diff --git a/config/plugins/vim-airline.vim b/config/plugins/vim-airline.vim
index 5b3e4024f..977b8258f 100644
--- a/config/plugins/vim-airline.vim
+++ b/config/plugins/vim-airline.vim
@@ -39,26 +39,16 @@ let g:airline#extensions#tabline#fnamecollapse = 1
 let g:airline#extensions#tabline#fnametruncate = 0
 "let g:airline#extensions#tabline#formatter = 'unique_tail_improved'
 call SpaceVim#mapping#def('nmap', '<leader>1', '<Plug>AirlineSelectTab1', 'Switch to airline tab 1', '', 'window 1')
-nmap <leader>2 <Plug>AirlineSelectTab2
-nmap <leader>3 <Plug>AirlineSelectTab3
-nmap <leader>4 <Plug>AirlineSelectTab4
-nmap <leader>5 <Plug>AirlineSelectTab5
-nmap <leader>6 <Plug>AirlineSelectTab6
-nmap <leader>7 <Plug>AirlineSelectTab7
-nmap <leader>8 <Plug>AirlineSelectTab8
-nmap <leader>9 <Plug>AirlineSelectTab9
-nmap <leader>- <Plug>AirlineSelectPrevTab
-nmap <leader>+ <Plug>AirlineSelectNextTab
-let g:_spacevim_mappings.2 = ['', 'window 2']
-let g:_spacevim_mappings.3 = ['', 'window 3']
-let g:_spacevim_mappings.4 = ['', 'window 4']
-let g:_spacevim_mappings.5 = ['', 'window 5']
-let g:_spacevim_mappings.6 = ['', 'window 6']
-let g:_spacevim_mappings.7 = ['', 'window 7']
-let g:_spacevim_mappings.8 = ['', 'window 8']
-let g:_spacevim_mappings.9 = ['', 'window 9']
-let g:_spacevim_mappings['-'] = ['', 'previous window']
-let g:_spacevim_mappings['+'] = ['', 'next window']
+call SpaceVim#mapping#def('nmap', '<leader>2', '<Plug>AirlineSelectTab2', 'Switch to airline tab 2', '', 'window 2')
+call SpaceVim#mapping#def('nmap', '<leader>3', '<Plug>AirlineSelectTab3', 'Switch to airline tab 3', '', 'window 3')
+call SpaceVim#mapping#def('nmap', '<leader>4', '<Plug>AirlineSelectTab4', 'Switch to airline tab 4', '', 'window 4')
+call SpaceVim#mapping#def('nmap', '<leader>5', '<Plug>AirlineSelectTab5', 'Switch to airline tab 5', '', 'window 5')
+call SpaceVim#mapping#def('nmap', '<leader>6', '<Plug>AirlineSelectTab6', 'Switch to airline tab 6', '', 'window 6')
+call SpaceVim#mapping#def('nmap', '<leader>7', '<Plug>AirlineSelectTab7', 'Switch to airline tab 7', '', 'window 7')
+call SpaceVim#mapping#def('nmap', '<leader>8', '<Plug>AirlineSelectTab8', 'Switch to airline tab 8', '', 'window 8')
+call SpaceVim#mapping#def('nmap', '<leader>9', '<Plug>AirlineSelectTab9', 'Switch to airline tab 9', '', 'window 9')
+call SpaceVim#mapping#def('nmap', '<leader>-', '<Plug>AirlineSelectPrevTab', 'Switch to previous airline tag', '', 'window previous')
+call SpaceVim#mapping#def('nmap', '<leader>+', '<Plug>AirlineSelectNextTab', 'Switch to next airline tag', '', 'window next')
 if !exists('g:airline_symbols')
   let g:airline_symbols = {}
 endif