1 files changed, 2 insertions, 2 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/SegmentedInputFormatter.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/util/SegmentedInputFormatter.kt
index ed471778eb..4eda2a5d20 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/SegmentedInputFormatter.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/util/SegmentedInputFormatter.kt
@@ -48,12 +48,12 @@ class SegmentedInputFormatter(val input: EditText, var separator: Char) : TextWa
             var end = input.selectionEnd
             var changed = false
 
-            if (start % separatorSkipCount == 0) {
+            if (start % separatorSkipCount == 0 && start > 0) {
                 start -= 1
                 changed = true
             }
 
-            if (end % separatorSkipCount == 0) {
+            if (end % separatorSkipCount == 0 && end > 0) {
                 end -= 1
                 changed = true
             }