diff --git a/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java b/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java
index bdff3def..2a2dbbf2 100644
--- a/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java
@@ -43,6 +43,7 @@ import android.util.Log;
 import android.view.IWindowManager;
 import android.view.View;
 import android.view.WindowManagerGlobal;
+import android.view.WindowManagerPolicyControl;
 import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -188,6 +189,7 @@ public class CyanogenSettingsPage extends SetupPage {
                     Log.i(TAG, "Applying default lockscreen");
                     LockPatternUtils util = new LockPatternUtils(mContext);
                     util.setThirdPartyKeyguard(cn);
+                    disableImmersivePromptForLockscreen(cn);
                 } catch (PackageManager.NameNotFoundException | SecurityException e) {
                     Log.w(TAG, "Error setting default lockscreen: " + cn, e);
                 }
@@ -195,6 +197,14 @@ public class CyanogenSettingsPage extends SetupPage {
         }
     }
 
+    private void disableImmersivePromptForLockscreen(ComponentName cn) {
+        // prevents the immersive screen hint for the lockscreen
+        WindowManagerPolicyControl policy = new WindowManagerPolicyControl();
+        policy.reloadFromSetting(mContext);
+        policy.addToPreconfirmWhiteList(cn.getPackageName());
+        policy.saveToSettings(mContext);
+    }
+
     private static boolean hideKeyDisabler(Context ctx) {
         final CMHardwareManager hardware = CMHardwareManager.getInstance(ctx);
         return !hardware.isSupported(CMHardwareManager.FEATURE_KEY_DISABLE);