diff --git a/rc/filetype/elixir.kak b/rc/filetype/elixir.kak
index 5b215942..2485d733 100644
--- a/rc/filetype/elixir.kak
+++ b/rc/filetype/elixir.kak
@@ -94,8 +94,8 @@ define-command -hidden elixir-trim-indent %{
 
 define-command -hidden elixir-insert-on-new-line %[
     evaluate-commands -no-hooks -draft -itersel %[
-        # copy -- comments prefix and following white spaces
-        try %{ execute-keys -draft k <a-x> s ^\h*\K--\h* <ret> y gh j P }
+        # copy '#' comment prefix and following white spaces
+        try %{ exec -draft k <a-x> s ^\h*#\h* <ret> y jgh P }
         # wisely add end structure
         evaluate-commands -save-regs x %[
             try %{ execute-keys -draft k <a-x> s ^ \h + <ret> \" x y } catch %{ reg x '' }
diff --git a/test/indent/elixir/insert-comment-hash/cmd b/test/indent/elixir/insert-comment-hash/cmd
new file mode 100644
index 00000000..e3036a40
--- /dev/null
+++ b/test/indent/elixir/insert-comment-hash/cmd
@@ -0,0 +1 @@
+c<ret>
diff --git a/test/indent/elixir/insert-comment-hash/in b/test/indent/elixir/insert-comment-hash/in
new file mode 100644
index 00000000..9072f4db
--- /dev/null
+++ b/test/indent/elixir/insert-comment-hash/in
@@ -0,0 +1 @@
+# Comment %( )comment2
diff --git a/test/indent/elixir/insert-comment-hash/out b/test/indent/elixir/insert-comment-hash/out
new file mode 100644
index 00000000..bde83b7a
--- /dev/null
+++ b/test/indent/elixir/insert-comment-hash/out
@@ -0,0 +1,2 @@
+# Comment
+# comment2
diff --git a/test/indent/elixir/insert-comment-hash/rc b/test/indent/elixir/insert-comment-hash/rc
new file mode 100644
index 00000000..5cc4387c
--- /dev/null
+++ b/test/indent/elixir/insert-comment-hash/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/elixir.kak"
+set buffer filetype elixir