diff --git a/rc/filetype/rust.kak b/rc/filetype/rust.kak
index f32264ee..28cb98c3 100644
--- a/rc/filetype/rust.kak
+++ b/rc/filetype/rust.kak
@@ -52,8 +52,8 @@ define-command -hidden rust-indent-on-new-line %~
         try %{ execute-keys -draft k : rust-trim-indent <ret> }
         # indent after lines ending with { or (
         try %[ execute-keys -draft k <a-x> <a-k> [{(]\h*$ <ret> j <a-gt> ]
-        # align to opening paren of previous line
-        try %{ execute-keys -draft [( <a-k> \A\([^\n]+\n[^\n]*\n?\z <ret> s \A\(\h*.|.\z <ret> & }
+        # indent after lines ending with [{(].+ and move first parameter to own line
+        try %< execute-keys -draft [c[({],[)}] <ret> <a-k> \A[({][^\n]+\n[^\n]*\n?\z <ret> L i<ret><esc> <gt> <a-S> <a-&> >
     >
 ~
 
@@ -64,10 +64,10 @@ define-command -hidden rust-indent-on-opening-curly-brace %[
     _
 ]
 
-define-command -hidden rust-indent-on-closing-curly-brace %[
+define-command -hidden rust-indent-on-closing %[
     evaluate-commands -draft -itersel %_
-        # align to opening curly brace when alone on a line
-        try %[ execute-keys -draft <a-h> <a-k> ^\h+\}$ <ret> h m s \A|.\z <ret> 1<a-&> ]
+        # align to opening curly brace or paren when alone on a line
+        try %< execute-keys -draft <a-h> <a-k> ^\h*[)}]$ <ret> h m <a-S> 1<a-&> >
     _
 ]
 
@@ -83,7 +83,7 @@ hook global WinSetOption filetype=rust %[
     hook window ModeChange insert:.* -group rust-trim-indent  rust-trim-indent
     hook window InsertChar \n -group rust-indent rust-indent-on-new-line
     hook window InsertChar \{ -group rust-indent rust-indent-on-opening-curly-brace
-    hook window InsertChar \} -group rust-indent rust-indent-on-closing-curly-brace
+    hook window InsertChar [)}] -group rust-indent rust-indent-on-closing
     hook -once -always window WinSetOption filetype=.* %{ remove-hooks window rust-.+ }
 ]
 
diff --git a/test/indent/rust/after-open-with-chars/cmd b/test/indent/rust/after-open-with-chars/cmd
new file mode 100644
index 00000000..b11ad994
--- /dev/null
+++ b/test/indent/rust/after-open-with-chars/cmd
@@ -0,0 +1 @@
+c<ret>baz<esc>
diff --git a/test/indent/rust/after-open-with-chars/in b/test/indent/rust/after-open-with-chars/in
new file mode 100644
index 00000000..1f977479
--- /dev/null
+++ b/test/indent/rust/after-open-with-chars/in
@@ -0,0 +1,3 @@
+    Foo {bar,%( )
+
+    foo(bar,%( )
diff --git a/test/indent/rust/after-open-with-chars/out b/test/indent/rust/after-open-with-chars/out
new file mode 100644
index 00000000..e1475aab
--- /dev/null
+++ b/test/indent/rust/after-open-with-chars/out
@@ -0,0 +1,7 @@
+    Foo {
+        bar,
+        baz
+
+    foo(
+        bar,
+        baz
diff --git a/test/indent/rust/after-open-with-chars/rc b/test/indent/rust/after-open-with-chars/rc
new file mode 100644
index 00000000..64064c25
--- /dev/null
+++ b/test/indent/rust/after-open-with-chars/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/rust.kak"
+set buffer filetype rust
diff --git a/test/indent/rust/after-open/cmd b/test/indent/rust/after-open/cmd
new file mode 100644
index 00000000..8682d51e
--- /dev/null
+++ b/test/indent/rust/after-open/cmd
@@ -0,0 +1 @@
+c<ret>bar<esc>
diff --git a/test/indent/rust/after-open/in b/test/indent/rust/after-open/in
new file mode 100644
index 00000000..c403940b
--- /dev/null
+++ b/test/indent/rust/after-open/in
@@ -0,0 +1,3 @@
+    Foo {%( )
+
+    foo(%( )
diff --git a/test/indent/rust/after-open/out b/test/indent/rust/after-open/out
new file mode 100644
index 00000000..eaf2cdd4
--- /dev/null
+++ b/test/indent/rust/after-open/out
@@ -0,0 +1,5 @@
+    Foo {
+        bar
+
+    foo(
+        bar
diff --git a/test/indent/rust/after-open/rc b/test/indent/rust/after-open/rc
new file mode 100644
index 00000000..64064c25
--- /dev/null
+++ b/test/indent/rust/after-open/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/rust.kak"
+set buffer filetype rust
diff --git a/test/indent/rust/align-closing-brace/cmd b/test/indent/rust/align-closing-brace/cmd
new file mode 100644
index 00000000..262bd1f0
--- /dev/null
+++ b/test/indent/rust/align-closing-brace/cmd
@@ -0,0 +1 @@
+c<ret>}<esc>
diff --git a/test/indent/rust/align-closing-brace/in b/test/indent/rust/align-closing-brace/in
new file mode 100644
index 00000000..323a91e3
--- /dev/null
+++ b/test/indent/rust/align-closing-brace/in
@@ -0,0 +1,3 @@
+    Foo {
+        bar,
+        baz,%( )
diff --git a/test/indent/rust/align-closing-brace/out b/test/indent/rust/align-closing-brace/out
new file mode 100644
index 00000000..22cfb580
--- /dev/null
+++ b/test/indent/rust/align-closing-brace/out
@@ -0,0 +1,4 @@
+    Foo {
+        bar,
+        baz,
+    }
diff --git a/test/indent/rust/align-closing-brace/rc b/test/indent/rust/align-closing-brace/rc
new file mode 100644
index 00000000..64064c25
--- /dev/null
+++ b/test/indent/rust/align-closing-brace/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/rust.kak"
+set buffer filetype rust
diff --git a/test/indent/rust/align-closing-paren/cmd b/test/indent/rust/align-closing-paren/cmd
new file mode 100644
index 00000000..0df56293
--- /dev/null
+++ b/test/indent/rust/align-closing-paren/cmd
@@ -0,0 +1 @@
+c<ret>)<esc>
diff --git a/test/indent/rust/align-closing-paren/in b/test/indent/rust/align-closing-paren/in
new file mode 100644
index 00000000..e356f41a
--- /dev/null
+++ b/test/indent/rust/align-closing-paren/in
@@ -0,0 +1,3 @@
+    foo(
+        bar,
+        baz,%( )
diff --git a/test/indent/rust/align-closing-paren/out b/test/indent/rust/align-closing-paren/out
new file mode 100644
index 00000000..7650c5d4
--- /dev/null
+++ b/test/indent/rust/align-closing-paren/out
@@ -0,0 +1,4 @@
+    foo(
+        bar,
+        baz,
+    )
diff --git a/test/indent/rust/align-closing-paren/rc b/test/indent/rust/align-closing-paren/rc
new file mode 100644
index 00000000..64064c25
--- /dev/null
+++ b/test/indent/rust/align-closing-paren/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/rust.kak"
+set buffer filetype rust