diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php
index ee0ccf9e..a7f76f31 100644
--- a/code/ModelAdmin.php
+++ b/code/ModelAdmin.php
@@ -610,6 +610,7 @@ class ModelAdmin_CollectionController extends Controller {
 			$this->modelClass,
 			$summaryFields
 		);
+		
 		$tf->setCustomQuery($this->getSearchQuery($searchCriteria));
 		$tf->setPageSize($this->parentController->stat('page_length'));
 		$tf->setShowPagination(true);
diff --git a/css/ModelAdmin.css b/css/ModelAdmin.css
index f4fe2d74..a5edb2bd 100644
--- a/css/ModelAdmin.css
+++ b/css/ModelAdmin.css
@@ -67,7 +67,7 @@ body.ModelAdmin #ResultTable_holder {
 }
 
 body.ModelAdmin #right{
-	overflow:auto;
+	overflow:auto !important;
 }
 
 body.ModelAdmin #right #ModelAdminPanel {
diff --git a/templates/Includes/ModelAdmin_right.ss b/templates/Includes/ModelAdmin_right.ss
index 709c51b2..9ce29808 100755
--- a/templates/Includes/ModelAdmin_right.ss
+++ b/templates/Includes/ModelAdmin_right.ss
@@ -1,5 +1,5 @@
 
-<div id="ModelAdminPanel" style="overflow: auto">
+<div id="ModelAdminPanel">
 
 <% if EditForm %>
 	$EditForm