1 files changed, 8 insertions, 3 deletions
diff --git a/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java b/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java
index 2ff4afa..49b04ee 100644
--- a/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java
@@ -123,9 +123,14 @@ public class CyanogenSettingsPage extends SetupPage {
 
     @Override
     public void onFinishSetup() {
-        if (getData().containsKey(KEY_ENABLE_NAV_KEYS)) {
-            writeDisableNavkeysOption(mContext, getData().getBoolean(KEY_ENABLE_NAV_KEYS));
-        }
+        getCallbacks().addFinishRunnable(new Runnable() {
+            @Override
+            public void run() {
+                if (getData().containsKey(KEY_ENABLE_NAV_KEYS)) {
+                    writeDisableNavkeysOption(mContext, getData().getBoolean(KEY_ENABLE_NAV_KEYS));
+                }
+            }
+        });
         handleWhisperPushRegistration();
         handleEnableMetrics();
         handleDefaultThemeSetup();