diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bbe726e8d9..6856f04e7c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -233,6 +233,7 @@
 
     <activity android:name=".NewConversationActivity"
               android:theme="@style/TextSecure.LightNoActionBar"
+              android:windowSoftInputMode="stateAlwaysVisible"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".PushContactSelectionActivity"
diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index 0a5ba8ed5d..1205ca2a88 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -99,7 +99,9 @@
                         android:layout_weight="1"
                         android:nextFocusForward="@+id/send_button"
                         android:nextFocusRight="@+id/send_button"
-                        tools:hint="Send TextSecure message" />
+                        tools:hint="Send TextSecure message">
+                    <requestFocus />
+                </org.thoughtcrime.securesms.components.ComposeText>
 
                 <org.thoughtcrime.securesms.components.camera.HidingImageButton
                         android:id="@+id/quick_attachment_toggle"