diff --git a/plugin/tagbar.vim b/plugin/tagbar.vim
index d273e8a..fc3aaf0 100644
--- a/plugin/tagbar.vim
+++ b/plugin/tagbar.vim
@@ -206,6 +206,7 @@ function! s:OpenWindow()
     nnoremap <script> <silent> <buffer> <2-LeftMouse>
                                               \ :call <SID>JumpToTag()<CR>
     nnoremap <script> <silent> <buffer> <Space> :call <SID>ShowPrototype()<CR>
+    nnoremap <script> <silent> <buffer> q       :close<CR>
 
     augroup TagbarAutoCmds
         autocmd!