diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 73fddfea2f..e3f595eff7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -128,6 +128,7 @@
 
     <activity android:name=".ContactSelectionActivity"
               android:label="@string/AndroidManifest__select_contacts"
+              android:windowSoftInputMode="stateHidden"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".AutoInitiateActivity"
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index c13e926781..c41670edb1 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -646,6 +646,9 @@ public class ConversationActivity extends PassphraseRequiredSherlockFragmentActi
 
     if (this.recipients != null) {
       recipientsPanel.addRecipients(this.recipients);
+    } else {
+      InputMethodManager input = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
+      input.toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, 0);
     }
   }