diff --git a/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java b/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java
index 91b7954c..3c517f42 100644
--- a/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java
@@ -207,7 +207,7 @@ public class CyanogenSettingsPage extends SetupPage {
                 SetupWizardUtils.isSimMissing(context));
     }
 
-    protected static boolean hideThemeSwitch(Context context) {
+    private static boolean hideThemeSwitch(Context context) {
         return ThemeUtils.getDefaultThemePackageName(context).equals(ThemeConfig.SYSTEM_DEFAULT);
     }
 
@@ -399,12 +399,14 @@ public class CyanogenSettingsPage extends SetupPage {
 
         private void updateDisableNavkeysOption() {
             if (!mHideNavKeysRow) {
+                final Bundle myPageBundle = mPage.getData();
                 boolean enabled = Settings.Secure.getInt(getActivity().getContentResolver(),
                         Settings.Secure.DEV_FORCE_SHOW_NAVBAR, 0) != 0;
-                boolean checked = mPage.getData().containsKey(KEY_ENABLE_NAV_KEYS) ?
-                        mPage.getData().getBoolean(KEY_ENABLE_NAV_KEYS) :
+                boolean checked = myPageBundle.containsKey(KEY_ENABLE_NAV_KEYS) ?
+                        myPageBundle.getBoolean(KEY_ENABLE_NAV_KEYS) :
                         enabled;
                 mNavKeys.setChecked(checked);
+                myPageBundle.putBoolean(KEY_ENABLE_NAV_KEYS, checked);
             }
         }