diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
index 1ac3d196..64ee247c 100644
--- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
@@ -1307,10 +1307,9 @@ public final class ComposeActivity extends BaseActivity
         builder.append(media.textUrl);
         builder.setSpan(item.uploadUrl, 1, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
         int cursorStart = textEditor.getSelectionStart();
+        int cursorEnd = textEditor.getSelectionEnd();
         textEditor.append(builder);
-        if (cursorStart == textEditor.getText().length()) {
-            textEditor.setSelection(cursorStart);
-        }
+        textEditor.setSelection(cursorStart, cursorEnd);
 
         waitForMediaLatch.countDown();
     }