diff --git a/after/ftplugin/c.vim b/after/ftplugin/c.vim
index 6f3c734..8d50009 100644
--- a/after/ftplugin/c.vim
+++ b/after/ftplugin/c.vim
@@ -6,3 +6,5 @@ setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,:///,://
 setlocal commentstring=//%s
 " Stop automatic new lines which typing long single liners
 setlocal textwidth=0
+" Map K to get YouCompleteMe documentation
+nnoremap K :YcmCompleter GetDoc<CR>
diff --git a/after/ftplugin/cpp.vim b/after/ftplugin/cpp.vim
new file mode 100644
index 0000000..0831f7e
--- /dev/null
+++ b/after/ftplugin/cpp.vim
@@ -0,0 +1,2 @@
+" Map K to get YouCompleteMe documentation
+nnoremap K :YcmCompleter GetDoc<CR>
diff --git a/plugin/mappings.vim b/plugin/mappings.vim
index 8e7a5ac..505bce7 100644
--- a/plugin/mappings.vim
+++ b/plugin/mappings.vim
@@ -2,11 +2,10 @@
 nnoremap <CR> @@
 
 " YouCompleteMe
-nnoremap <leader>fx :YcmCompleter FixIt<CR>
-nnoremap <leader>jd :YcmCompleter GoTo<CR>
+nnoremap <leader>fi :YcmCompleter FixIt<CR>
+nnoremap <leader>gd :YcmCompleter GoTo<CR>
 nnoremap <leader>gt :YcmCompleter GetType<CR>
 nnoremap <leader>gp :YcmCompleter GetParent<CR>
-nnoremap <leader>gd :YcmCompleter GetDoc<CR>
 nnoremap <leader>sd :YcmShowDetailedDiagnostic<CR>
 
 " DoxygenToolkit