diff --git a/config/global.ini.php b/config/global.ini.php
index 3065a7d22b11de556457301c49cde27316f74175..6d447a11a8685cbb0589b7102154ba614c69d675 100644
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -81,6 +81,9 @@ site_selector_max_sites = 10
 ; if set to 1, shows sparklines (evolution graph) in 'All Websites' report (MultiSites plugin)
 show_multisites_sparklines = 1
 
+; number of websites to display per page in the All Websites dashboard
+all_websites_website_per_page = 50
+
 ; if set to 0, the anonymous user will not be able to use the 'segments' parameter in the API request
 ; this is useful to prevent full DB access to the anonymous user, or to limit performance usage
 anonymous_user_enable_use_segments_API = 1
diff --git a/plugins/MultiSites/Controller.php b/plugins/MultiSites/Controller.php
index 63e351c7b552b3f63343c129414437dde6f6568a..8bd6f873600102a12a4aaefc4968e98c5f0da7fa 100644
--- a/plugins/MultiSites/Controller.php
+++ b/plugins/MultiSites/Controller.php
@@ -21,11 +21,17 @@ class Piwik_MultiSites_Controller extends Piwik_Controller
 	protected $evolutionBy = 'visits';
 	protected $mySites = array();
 	protected $page = 1;
-	protected $limit = 20;
+	protected $limit = 0;
 	protected $period;
 	protected $date;
 	protected $dateToStr;
 
+	function __construct()
+	{
+		parent::__construct();
+		
+		$this->limit = Zend_Registry::get('config')->General->all_websites_website_per_page;
+	}
 
 	function index()
 	{