diff --git a/components/ItemGrid/LoadItemsTask2.bs b/components/ItemGrid/LoadItemsTask2.bs
index 80e176ad..515397f2 100644
--- a/components/ItemGrid/LoadItemsTask2.bs
+++ b/components/ItemGrid/LoadItemsTask2.bs
@@ -12,7 +12,7 @@ sub init()
     m.top.sortField = "SortName"
     m.top.functionName = "loadItems"
 
-    m.top.limit = 60
+    m.top.limit = chainLookupReturn(m.global.session, "user.settings.`ui.library.loadItemsLimit`", 60)
 end sub
 
 sub loadItems()
diff --git a/components/settings/settings.bs b/components/settings/settings.bs
index ec82242e..6b798834 100644
--- a/components/settings/settings.bs
+++ b/components/settings/settings.bs
@@ -148,6 +148,10 @@ sub onKeyGridSubmit()
         m.integerSetting.text = selectedSetting.max
         return
     end if
+    if isValid(selectedSetting.min) and m.integerSetting.text.ToInt() < selectedSetting.min.ToInt()
+        m.integerSetting.text = selectedSetting.min
+        return
+    end if
     set_user_setting(selectedSetting.settingName, m.integerSetting.text)
     m.settingsMenu.setFocus(true)
 end sub
diff --git a/locale/en_US/translations.ts b/locale/en_US/translations.ts
index 39f92bd8..f2eee769 100644
--- a/locale/en_US/translations.ts
+++ b/locale/en_US/translations.ts
@@ -1563,6 +1563,16 @@
             <translation>Number of columns in library view when showing square images</translation>
             <extracomment>Libraries Setting - Setting description</extracomment>
         </message>
+	<message>
+	    <source>Load Items Limit</source>
+	    <translation>Load Items Limit</translation>
+	    <extracomment>Libraries Setting - Setting title</extracomment>
+        </message>
+	<message>
+	    <source>Number of items to load together on library screens.</source>
+	    <translation>Number of items to load together on library screens.</translation>
+	    <extracomment>Libraries Setting - Setting description</extracomment>
+        </message>
 
         <message>
             <source>View All Next Up</source>
@@ -2318,4 +2328,4 @@
             <translation>Screen Settings</translation>
         </message>
     </context>
-</TS>
\ No newline at end of file
+</TS>
diff --git a/settings/settings.json b/settings/settings.json
index fce25036..def95c33 100644
--- a/settings/settings.json
+++ b/settings/settings.json
@@ -1297,6 +1297,14 @@
               }
             ]
           },
+          {
+            "title": "Load Items Limit",
+            "description": "Number of items to load together on library screens.",
+            "settingName": "ui.library.loadItemsLimit",
+            "type": "integer",
+            "min": "15",
+            "default": "60"
+          },
           {
             "title": "TV Shows",
             "description": "Settings relating to the appearance of pages in TV Libraries.",
@@ -1334,4 +1342,4 @@
     "visible": false,
     "children": []
   }
-]
\ No newline at end of file
+]
diff --git a/source/static/whatsNew/3.1.8.json b/source/static/whatsNew/3.1.8.json
index 1b7b185d..ea9adafb 100644
--- a/source/static/whatsNew/3.1.8.json
+++ b/source/static/whatsNew/3.1.8.json
@@ -26,5 +26,9 @@
   {
     "description": "Fix videos sometimes loading twice",
     "author": "gabeluci"
+  },
+  {
+    "description": "Add setting to select how many items are loaded together on library screens",
+    "author": "brianpardy"
   }
-]
\ No newline at end of file
+]