diff --git a/res/values-sw600dp/config.xml b/res/values-sw600dp/config.xml
index fe8827418..eb3c5a529 100644
--- a/res/values-sw600dp/config.xml
+++ b/res/values-sw600dp/config.xml
@@ -1,6 +1,8 @@
 <resources>
     <integer name="cell_count_x">6</integer>
     <integer name="cell_count_y">6</integer>
+    <integer name="cell_max_count_x">7</integer>
+    <integer name="cell_max_count_y">7</integer>
     <integer name="hotseat_cell_count">7</integer>
     <integer name="hotseat_all_apps_index">3</integer>
     <bool name="allow_rotation">true</bool>
diff --git a/res/values-sw720dp/config.xml b/res/values-sw720dp/config.xml
index dcf11c711..2a0d18ab8 100644
--- a/res/values-sw720dp/config.xml
+++ b/res/values-sw720dp/config.xml
@@ -1,6 +1,8 @@
 <resources>
     <integer name="cell_count_x">8</integer>
     <integer name="cell_count_y">5</integer>
+    <integer name="cell_max_count_x">9</integer>
+    <integer name="cell_max_count_y">9</integer>
     <integer name="hotseat_cell_count">7</integer>
     <integer name="hotseat_all_apps_index">3</integer>
     <bool name="config_largeHeap">true</bool>
diff --git a/res/values/config.xml b/res/values/config.xml
index af3e08759..6257ee669 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -77,6 +77,8 @@
 
     <integer name="cell_count_x">4</integer>
     <integer name="cell_count_y">4</integer>
+    <integer name="cell_max_count_x">6</integer>
+    <integer name="cell_max_count_y">6</integer>
 
     <!-- Whether or not to use custom clings if a custom workspace layout is passed in -->
     <bool name="config_useCustomClings">false</bool>
diff --git a/res/xml/preferences_homescreen.xml b/res/xml/preferences_homescreen.xml
index 9c79255be..6d357cc40 100644
--- a/res/xml/preferences_homescreen.xml
+++ b/res/xml/preferences_homescreen.xml
@@ -25,9 +25,9 @@
             android:summary="@string/preferences_interface_homescreen_general_grid_summary"
             launcher:pickerTitle1="@string/preferences_interface_homescreen_general_grid_rows_title"
             launcher:pickerTitle2="@string/preferences_interface_homescreen_general_grid_columns_title"
-            launcher:max1="7"
+            launcher:max1="@integer/cell_max_count_x"
             launcher:min1="3"
-            launcher:max2="7"
+            launcher:max2="@integer/cell_max_count_y"
             launcher:min2="3" />
         <com.android.launcher2.preference.NumberPickerPreference android:key="ui_homescreen_screens"
             android:title="@string/preferences_interface_homescreen_general_screens_title"
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 391091562..d5e35d505 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -355,7 +355,10 @@ public Workspace(Context context, AttributeSet attrs, int defStyle) {
             cellCountX = PreferencesProvider.getCellCountX(cellCountX);
             cellCountY = PreferencesProvider.getCellCountY(cellCountY);
         //}
-        
+
+        cellCountX = Math.min(cellCountX, res.getInteger(R.integer.cell_max_count_x));
+        cellCountY = Math.min(cellCountY, res.getInteger(R.integer.cell_max_count_y));
+
         a.recycle();
 
         setOnHierarchyChangeListener(this);