diff --git a/vimrc b/vimrc
index 5f2d290..ac833b4 100644
--- a/vimrc
+++ b/vimrc
@@ -637,12 +637,12 @@ endfun
 " save. So if you make changes to them then you need to manually reload this
 " file using <leader>rv or whatever. :ReloadVimrcError
 function! DoSingleWrite()
-    write
+    write!
     call s:CreateCtags()
 endfunction
 
 function! DoSingleWriteThenQuit()
-    write
+    write!
     call s:CreateCtags()
     quit
 endfunction
@@ -797,6 +797,8 @@ let g:localvimrc_ask = 0
 " TAGBAR
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 noremap <F12> :TagbarToggle<cr>
+" Sort tags by their order in the source file. Press 's' to sort them alphabetically.
+let g:tagbar_sort = 0
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " GITGUTTER