diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
index 11d93b82..6c1e4d8a 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
@@ -423,6 +423,25 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
                 gridSizeMenu.findItem(R.id.action_grid_size_8).setChecked(true);
                 break;
         }
+        int maxGridSize = fragment.getMaxGridSize();
+        if (maxGridSize < 8) {
+            gridSizeMenu.findItem(R.id.action_grid_size_8).setVisible(false);
+        }
+        if (maxGridSize < 7) {
+            gridSizeMenu.findItem(R.id.action_grid_size_7).setVisible(false);
+        }
+        if (maxGridSize < 6) {
+            gridSizeMenu.findItem(R.id.action_grid_size_6).setVisible(false);
+        }
+        if (maxGridSize < 5) {
+            gridSizeMenu.findItem(R.id.action_grid_size_5).setVisible(false);
+        }
+        if (maxGridSize < 4) {
+            gridSizeMenu.findItem(R.id.action_grid_size_4).setVisible(false);
+        }
+        if (maxGridSize < 3) {
+            gridSizeMenu.findItem(R.id.action_grid_size_3).setVisible(false);
+        }
     }
 
     private boolean handleGridSizeMenuItem(@NonNull AbsMainActivityRecyclerViewCustomGridSizeFragment fragment, @NonNull MenuItem item) {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityRecyclerViewCustomGridSizeFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityRecyclerViewCustomGridSizeFragment.java
index 2881f351..03686c87 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityRecyclerViewCustomGridSizeFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityRecyclerViewCustomGridSizeFragment.java
@@ -26,6 +26,14 @@ public abstract class AbsMainActivityRecyclerViewCustomGridSizeFragment<A extend
         return gridSize;
     }
 
+    public int getMaxGridSize() {
+        if (isLandscape()) {
+            return getResources().getInteger(R.integer.max_columns_land);
+        } else {
+            return getResources().getInteger(R.integer.max_columns);
+        }
+    }
+
     /**
      * @return whether the palette should be used at all or not
      */
diff --git a/app/src/main/res/values-sw600dp/integers.xml b/app/src/main/res/values-sw600dp/integers.xml
index a438ee0d..826769fc 100644
--- a/app/src/main/res/values-sw600dp/integers.xml
+++ b/app/src/main/res/values-sw600dp/integers.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <integer name="default_grid_columns">4</integer>
-    <integer name="default_list_columns">2</integer>
     <integer name="default_grid_columns_land">6</integer>
+
+    <integer name="default_list_columns">2</integer>
     <integer name="default_list_columns_land">3</integer>
+
+    <integer name="max_columns">6</integer>
+    <integer name="max_columns_land">8</integer>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml
index c6a61746..40111957 100644
--- a/app/src/main/res/values/integers.xml
+++ b/app/src/main/res/values/integers.xml
@@ -6,5 +6,8 @@
     <integer name="default_list_columns">1</integer>
     <integer name="default_list_columns_land">2</integer>
 
+    <integer name="max_columns">4</integer>
+    <integer name="max_columns_land">6</integer>
+
     <integer name="font_textStyle_medium">1</integer>
 </resources>
\ No newline at end of file