diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
index 57f73455d30..4974f784480 100644
--- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
+++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
@@ -133,7 +133,11 @@ public class StorageDashboardFragment extends DashboardFragment
 
         mPreferenceController.onLoadFinished(mAppsResult.get(UserHandle.myUserId()));
         updateSecondaryUserControllers(mSecondaryUsers, mAppsResult);
-        setLoading(false, true);
+
+        // setLoading always causes a flicker, so let's avoid doing it.
+        if (getView().findViewById(R.id.loading_container).getVisibility() == View.VISIBLE) {
+            setLoading(false, true);
+        }
     }
 
     @Override