1 files changed, 9 insertions, 6 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 714c5899d..3ce4a57fc 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1066,9 +1066,6 @@ public class Launcher extends Activity
         }
         super.onResume();
 
-
-        updateGridIfNeeded();
-
         // Restore the previous launcher state
         if (mOnResumeState == State.WORKSPACE) {
             showWorkspace(false);
@@ -1178,6 +1175,8 @@ public class Launcher extends Activity
         } else {
             mHiddenFolderAuth = false;
         }
+
+        updateGridIfNeeded();
     }
 
     @Override
@@ -1286,10 +1285,14 @@ public class Launcher extends Activity
     }
 
     public void setDynamicGridSize(DeviceProfile.GridSize size) {
-        SettingsProvider.putInt(this,
-                SettingsProvider.SETTINGS_UI_DYNAMIC_GRID_SIZE, size.getValue());
+        int gridSize = SettingsProvider.getIntCustomDefault(this,
+                SettingsProvider.SETTINGS_UI_DYNAMIC_GRID_SIZE, 0);
+        if (gridSize != size.getValue()) {
+            SettingsProvider.putInt(this,
+                    SettingsProvider.SETTINGS_UI_DYNAMIC_GRID_SIZE, size.getValue());
 
-        updateDynamicGrid();
+            setUpdateDynamicGrid();
+        }
 
         mOverviewSettingsPanel.notifyDataSetInvalidated();