diff --git a/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java b/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
index 93c5f31..16fefc7 100644
--- a/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
+++ b/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
@@ -76,20 +76,7 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks
 
     private final ArrayList<Runnable> mFinishRunnables = new ArrayList<Runnable>();
 
-    private ThemeManager.ThemeChangeListener mThemeChangeListener = new ThemeManager.ThemeChangeListener() {
-        @Override
-        public void onProgress(int progress) {
-            if (progress > 0) {
-                mFinishingProgressBar.setIndeterminate(false);
-                mFinishingProgressBar.setProgress(progress);
-            }
-        }
-
-        @Override
-        public void onFinish(boolean isSuccess) {
-            finishSetup();
-        }
-    };
+    private ThemeManager.ThemeChangeListener mThemeChangeListener;
 
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -305,6 +292,20 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks
         mFinishingProgressBar.setIndeterminate(true);
         mFinishingProgressBar.startAnimation(fadeIn);
         final ThemeManager tm = (ThemeManager) getSystemService(Context.THEME_SERVICE);
+        mThemeChangeListener = new ThemeManager.ThemeChangeListener() {
+            @Override
+            public void onProgress(int progress) {
+                if (progress > 0) {
+                    mFinishingProgressBar.setIndeterminate(false);
+                    mFinishingProgressBar.setProgress(progress);
+                }
+            }
+
+            @Override
+            public void onFinish(boolean isSuccess) {
+                finishSetup();
+            }
+        };
         tm.addClient(mThemeChangeListener);
         mSetupData.finishPages();
         SetupStats.addEvent(SetupStats.Categories.APP_FINISHED, TAG,