diff --git a/rc/filetype/crystal.kak b/rc/filetype/crystal.kak
index 1a55ffde..74c283d8 100644
--- a/rc/filetype/crystal.kak
+++ b/rc/filetype/crystal.kak
@@ -190,8 +190,8 @@ define-command -hidden crystal-indent-on-char %{
     evaluate-commands -no-hooks -draft -itersel %{
         # align 'else/elsif' to 'if'
         try %{ execute-keys -draft <a-x> <a-k> ^\h*(?:else|elsif)$ <ret> <a-a>i <a-semicolon> <a-?> ^\h*(?:if)                                                    <ret> <a-S> 1<a-&> }
-        # align 'when' to 'case'
-        try %{ execute-keys -draft <a-x> <a-k> ^\h*(?:when)$       <ret> <a-a>i <a-semicolon> <a-?> ^\h*(?:case)                                                  <ret> <a-S> 1<a-&> }
+        # align 'else/when' to 'case'
+        try %{ execute-keys -draft <a-x> <a-k> ^\h*(?:else|when)$       <ret> <a-a>i <a-semicolon> <a-?> ^\h*(?:case)                                             <ret> <a-S> 1<a-&> }
         # align 'rescue' to 'begin/def'
         try %{ execute-keys -draft <a-x> <a-k> ^\h*(?:rescue)$     <ret> <a-a>i <a-semicolon> <a-?> ^\h*(?:begin|def)                                             <ret> <a-S> 1<a-&> }
         # align 'end' to opening structure