diff --git a/rc/filetype/crystal.kak b/rc/filetype/crystal.kak
index ae1ce819..b57f1518 100644
--- a/rc/filetype/crystal.kak
+++ b/rc/filetype/crystal.kak
@@ -7,12 +7,15 @@ hook global BufCreate '.*\.cr' %{
 
 hook global WinSetOption filetype=crystal %{
   require-module crystal
-  evaluate-commands set-option window static_words %opt{crystal_keywords} %opt{crystal_attributes} %opt{crystal_objects}
+
   add-highlighter window/crystal ref crystal
-  hook -group crystal window InsertChar '\n' crystal-new-line-inserted
+  evaluate-commands set-option window static_words %opt{crystal_keywords} %opt{crystal_attributes} %opt{crystal_objects}
+
+  hook window InsertChar '\n' -group crystal-indent crystal-new-line-inserted
+
   hook -always -once window WinSetOption filetype=.* %{
     remove-highlighter window/crystal
-    remove-hooks window crystal
+    remove-hooks window crystal-.+
   }
 }