diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index df75a0c5d..20d739e18 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -225,7 +225,7 @@
             android:label="@string/app_name"
             android:name="com.android.email2.ui.MailActivityEmail"
             android:theme="@style/MailActivityTheme"
-            android:windowSoftInputMode="stateHidden">
+            android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />