diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/view/UnscrollableEditText.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/view/UnscrollableEditText.kt
new file mode 100644
index 0000000000000000000000000000000000000000..3dbd0f6ba27a3f20ba95cbfff8c3948183029098
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/view/UnscrollableEditText.kt
@@ -0,0 +1,13 @@
+package de.rki.coronawarnapp.ui.view
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatEditText
+
+class UnscrollableEditText(context: Context, attributeSet: AttributeSet) :
+    AppCompatEditText(context, attributeSet) {
+    override fun onSelectionChanged(selStart: Int, selEnd: Int) {
+        super.onSelectionChanged(selStart, selEnd)
+        text?.length?.let { setSelection(it) }
+    }
+}
diff --git a/Corona-Warn-App/src/main/res/layout/view_tan_input_edittext.xml b/Corona-Warn-App/src/main/res/layout/view_tan_input_edittext.xml
index 9aca2e5aabbc809514cd30cab4f85190a6aa26d6..22d20e9ebdf32039e54f0fc41ae5d921c5735fd1 100644
--- a/Corona-Warn-App/src/main/res/layout/view_tan_input_edittext.xml
+++ b/Corona-Warn-App/src/main/res/layout/view_tan_input_edittext.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <EditText
+    <de.rki.coronawarnapp.ui.view.UnscrollableEditText
         android:id="@+id/tan_input_edittext"
         style="@style/tanInputEdittext" />