diff --git a/tools/emacs/config/modes.el b/tools/emacs/config/modes.el
index 8d47f2f9a..69fb523d0 100644
--- a/tools/emacs/config/modes.el
+++ b/tools/emacs/config/modes.el
@@ -31,6 +31,7 @@
 ;; Transparently open compressed files
 (auto-compression-mode t)
 
-;; Show available key chord completions
+;; Configure go-mode for Go2 Alpha
+(add-to-list 'auto-mode-alist '("\\.go2$" . go-mode))
 
 (provide 'modes)