diff --git a/src/main/res/drawable/cursor_on_tertiary_container.xml b/src/main/res/drawable/cursor_on_tertiary_container.xml
new file mode 100644
index 000000000..9a86446ec
--- /dev/null
+++ b/src/main/res/drawable/cursor_on_tertiary_container.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <size android:width="2dp" />
+    <!-- width of the original cursor was measured on a Pixel 6a because it’s not documented anywhere -->
+    <solid android:color="?colorOnTertiaryContainer" />
+</shape>
\ No newline at end of file
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index 34a2b969e..cfb280eb5 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -100,9 +100,10 @@
                     android:inputType="textShortMessage|textMultiLine|textCapSentences"
                     android:maxLines="8"
                     android:minHeight="32dp"
+                    android:minLines="1"
                     android:textColor="?colorOnTertiaryContainer"
                     android:textColorHint="@color/hint_on_tertiary_container"
-                    android:minLines="1">
+                    android:textCursorDrawable="@drawable/cursor_on_tertiary_container">
 
                     <requestFocus />
                 </eu.siacs.conversations.ui.widget.EditMessage>