diff --git a/code/controllers/AssetAdmin.php b/code/controllers/AssetAdmin.php
index 4749b81c..d7b35dde 100644
--- a/code/controllers/AssetAdmin.php
+++ b/code/controllers/AssetAdmin.php
@@ -16,6 +16,14 @@ class AssetAdmin extends LeftAndMain implements PermissionProvider{
 
 	private static $tree_class = 'Folder';
 	
+	/**
+	 * Amount of results showing on a single page.
+	 *
+	 * @config
+	 * @var int
+	 */
+	private static $page_length = 15;
+	
 	/**
 	 * @config
 	 * @see Upload->allowedMaxFileSize
@@ -150,9 +158,9 @@ JS
 		$gridFieldConfig = GridFieldConfig::create()->addComponents(
 			new GridFieldToolbarHeader(),
 			new GridFieldSortableHeader(),
-			new GridFieldFilterHeader(),			
+			new GridFieldFilterHeader(),
 			new GridFieldDataColumns(),
-			new GridFieldPaginator(15),
+			new GridFieldPaginator(self::config()->page_length),
 			new GridFieldEditButton(),
 			new GridFieldDeleteAction(),
 			new GridFieldDetailForm(),
diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php
index a3eaed3f..340529ad 100644
--- a/code/controllers/CMSMain.php
+++ b/code/controllers/CMSMain.php
@@ -27,6 +27,14 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 	
 	private static $subitem_class = "Member";
 	
+	/**
+	 * Amount of results showing on a single page.
+	 *
+	 * @config
+	 * @var int
+	 */
+	private static $page_length = 15;
+	
 	private static $allowed_actions = array(
 		'buildbrokenlinks',
 		'deleteitems',
@@ -726,7 +734,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 		$gridFieldConfig = GridFieldConfig::create()->addComponents(			
 			new GridFieldSortableHeader(),
 			new GridFieldDataColumns(),
-			new GridFieldPaginator(15)
+			new GridFieldPaginator(self::config()->page_length)
 		);
 		if($parentID){
 			$gridFieldConfig->addComponent(