diff --git a/app/src/main/java/net/gsantner/markor/frontend/textview/AutoTextFormatter.java b/app/src/main/java/net/gsantner/markor/frontend/textview/AutoTextFormatter.java
index 4b9b2838a..359991dbd 100644
--- a/app/src/main/java/net/gsantner/markor/frontend/textview/AutoTextFormatter.java
+++ b/app/src/main/java/net/gsantner/markor/frontend/textview/AutoTextFormatter.java
@@ -47,7 +47,7 @@ private CharSequence autoIndent(final CharSequence source, final CharSequence de
 
         final OrderedListLine oLine = new OrderedListLine(dest, dstart, _patterns);
         final UnOrderedOrCheckListLine uLine = new UnOrderedOrCheckListLine(dest, dstart, _patterns);
-        final String indent = source + oLine.line.substring(0, oLine.indentEnd);
+        final String indent = source + oLine.line.substring(0, Math.min(oLine.indentEnd, dstart - oLine.lineStart));
 
         final String result;
         if (oLine.isOrderedList && oLine.lineEnd != oLine.groupEnd && dend >= oLine.groupEnd) {