diff --git a/res/xml/preferences_app_protection.xml b/res/xml/preferences_app_protection.xml
index d4d44866c1..7f402e4638 100644
--- a/res/xml/preferences_app_protection.xml
+++ b/res/xml/preferences_app_protection.xml
@@ -42,7 +42,7 @@
                             android:summary="@string/preferences__disable_screen_security_to_allow_screen_shots" />
 
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-            android:defaultValue="false"
+            android:defaultValue="true"
             android:key="pref_incognito_keyboard"
             android:title="@string/preferences__incognito_keyboard"
             android:summary="@string/preferences__request_keyboard_to_disable_personalized_learning"/>
diff --git a/src/org/thoughtcrime/securesms/components/ComposeText.java b/src/org/thoughtcrime/securesms/components/ComposeText.java
index 9f26a9f904..daaec06406 100644
--- a/src/org/thoughtcrime/securesms/components/ComposeText.java
+++ b/src/org/thoughtcrime/securesms/components/ComposeText.java
@@ -136,7 +136,11 @@ public class ComposeText extends EmojiEditText {
     }
 
     setInputType(inputType);
-    setImeOptions(imeOptions);
+    if (isIncognito) {
+      setImeOptions(imeOptions | 16777216);
+    } else {
+      setImeOptions(imeOptions);
+    }
     /*
     setHint(transport.getComposeHint(),
             transport.getSimName().isPresent()
diff --git a/src/org/thoughtcrime/securesms/loki/SeedActivity.kt b/src/org/thoughtcrime/securesms/loki/SeedActivity.kt
index 33dd27e62c..78a957f5a4 100644
--- a/src/org/thoughtcrime/securesms/loki/SeedActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/SeedActivity.kt
@@ -50,6 +50,7 @@ class SeedActivity : BaseActionBarActivity(), DeviceLinkingDialogDelegate {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_seed)
         setUpLanguageFileDirectory()
+        mnemonicEditText.input.imeOptions = mnemonicEditText.input.imeOptions or 16777216 // Always use incognito keyboard for this
         updateSeed()
         copyButton.setOnClickListener { copy() }
         toggleRegisterModeButton.setOnClickListener { mode = Mode.Register }
diff --git a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
index ed87f3dcae..0b2ab2d91b 100644
--- a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
+++ b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
@@ -346,7 +346,7 @@ public class TextSecurePreferences {
   }
 
   public static boolean isIncognitoKeyboardEnabled(Context context) {
-    return getBooleanPreference(context, INCOGNITO_KEYBORAD_PREF, false);
+    return getBooleanPreference(context, INCOGNITO_KEYBORAD_PREF, true);
   }
 
   public static boolean isReadReceiptsEnabled(Context context) {