diff --git a/.emacs b/.emacs
index 647dfb7..be879f8 100644
--- a/.emacs
+++ b/.emacs
@@ -512,7 +512,8 @@
   (go-mode . lsp-deferred)
   (go-mode . (lambda ()
 			   (add-hook 'before-save-hook #'lsp-format-buffer t t)
-			   (add-hook 'before-save-hook #'lsp-organize-imports t t)))
+			   (add-hook 'before-save-hook #'lsp-organize-imports t t)
+			   (subword-mode)))
   )
 
 (use-package glsl-mode)