1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/cyngn/theme/chooser/MyThemeFragment.java b/src/com/cyngn/theme/chooser/MyThemeFragment.java
index a7009d2..b053d86 100644
--- a/src/com/cyngn/theme/chooser/MyThemeFragment.java
+++ b/src/com/cyngn/theme/chooser/MyThemeFragment.java
@@ -385,10 +385,10 @@ public class MyThemeFragment extends ThemeFragment {
     protected Map<String, String> getComponentsToApply() {
         Map<String, String> componentsToApply = new HashMap<String, String>();
         // Only apply components that actually changed
-        for (String component : mCurrentTheme.keySet()) {
+        for (String component : mSelectedComponentsMap.keySet()) {
             String currentPkg = mCurrentTheme.get(component);
             String selectedPkg = mSelectedComponentsMap.get(component);
-            if (selectedPkg != null && !currentPkg.equals(selectedPkg)) {
+            if (currentPkg == null || !currentPkg.equals(selectedPkg)) {
                 componentsToApply.put(component, selectedPkg);
             }
         }