diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java
index b95920e04b7..587fd6448f5 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java
@@ -217,13 +217,16 @@ public class BatteryUsageBreakdownController extends BasePreferenceController
     }
 
     private void showSpinnerAndAppList() {
-        removeAndCacheAllPreferences();
         if (mBatteryDiffData == null) {
+            mHandler.post(() -> {
+                removeAndCacheAllPreferences();
+            });
             return;
         }
         mSpinnerPreference.setVisible(true);
         mAppListPreferenceGroup.setVisible(true);
         mHandler.post(() -> {
+            removeAndCacheAllPreferences();
             addAllPreferences();
         });
     }