diff --git a/vimrc.after b/vimrc.after
index ca4b50b..e35b406 100644
--- a/vimrc.after
+++ b/vimrc.after
@@ -13,9 +13,12 @@ autocmd BufNewFile,BufRead *.feature,*.rb,*.ru,*.xml,*.html,*.htm,Gemfile,Rakefi
 autocmd BufNewFile,BufRead *.java set efm=%A\ %#[javac]\ %f:%l:\ %m,%-Z\ %#[javac]\ %p^,%-C%.%#
     \| set makeprg=ant\ -find\ build.xml
 
-map ,t :w<cr>
-map ,m :w\|:make<cr><cr>
-map ,- :nohl<cr>
+map ,t :w<CR>
+map ,m :w\|:make<CR><CR>
+map ,- :nohl<CR>
+
+" remap ',t' in Go buffers to do :Fmt first
+autocmd BufNewFile,BufRead *.go map ,t :Fmt<CR>:w<CR>
 
 " (en|dis)able crosshairs!
 function! EnableCrosshairs()