diff --git a/lib/taskjuggler/VimSyntax.rb b/lib/taskjuggler/VimSyntax.rb
index ef1c976a..965db5e9 100644
--- a/lib/taskjuggler/VimSyntax.rb
+++ b/lib/taskjuggler/VimSyntax.rb
@@ -219,16 +219,20 @@ def highlights
 
 " Support browsing the man page by typing Shift-k while having the cursor over
 " any syntax keyword
-set keywordprg=tj3man
+if !has('gui_running')
+    set keywordprg=tj3man
+else
+    set keywordprg=tj3man\ --no-colors
+endif
 
 " Remap Ctrl-] to show full ID of property defined in the current
 " line. This requires a current ctags file (generated by 'tagfile'
 " report') to be present in the directory where vim was started.
-map <C-]> :call ShowFullID()<CR>
+map gi :call ShowFullID()<CR>
 function! ShowFullID()
   let linenumber = line(".")
   let filename = bufname("%")
-  execute "!grep '".filename."\t".linenumber.";' tags|cut -f 1"
+  execute "!grep '".filename."\\s*".linenumber.";' tags|cut -f 1"
 endfunction
 
 augroup TaskJugglerSource