diff --git a/autoload/airline/extensions/keymap.vim b/autoload/airline/extensions/keymap.vim
index 3be79491..4f549371 100644
--- a/autoload/airline/extensions/keymap.vim
+++ b/autoload/airline/extensions/keymap.vim
@@ -8,7 +8,7 @@ if !has('keymap')
 endif
 
 function! airline#extensions#keymap#status()
-  return printf('%s', (&keymap ? (g:airline_symbols.keymap . ' '. &keymap) : ''))
+  return printf('%s', (!empty(&keymap) ? (g:airline_symbols.keymap . ' '. &keymap) : ''))
 endfunction
 
 function! airline#extensions#keymap#init(ext)
diff --git a/autoload/airline/init.vim b/autoload/airline/init.vim
index 01d39987..57a24cb2 100644
--- a/autoload/airline/init.vim
+++ b/autoload/airline/init.vim
@@ -69,7 +69,8 @@ function! airline#init#bootstrap()
           \ 'paste': 'PASTE',
           \ 'spell': 'SPELL',
           \ 'modified': '+',
-          \ 'space': ' '
+          \ 'space': ' ',
+          \ 'keymap': 'Keymap:'
           \  }, 'keep')
 
   if get(g:, 'airline_powerline_fonts', 0)