diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d3e4db9f09..ae50e40594 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -29,7 +29,7 @@
         </activity>
 
     <activity android:name=".ConversationActivity"
-              android:windowSoftInputMode="stateHidden"
+              android:windowSoftInputMode="stateUnchanged"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/>
 
     <activity android:name=".PassphraseCreateActivity"