diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index bdd718f088..d48bcc893f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -403,6 +403,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
         } else {
           String nickname = DatabaseFactory.getStorage(this).getDisplayName(getRecipient().getAddress().serialize());
           titleTextView.setText(nickname);
+          titleTextView.setSelection(nickname.length());
           imm.showSoftInput(v, 0);
           cancelButtonContainer.setVisibility(View.VISIBLE);
         }