diff --git a/admin/javascript/ModelAdmin.js b/admin/javascript/ModelAdmin.js
index 306c584e1..c4730eec0 100644
--- a/admin/javascript/ModelAdmin.js
+++ b/admin/javascript/ModelAdmin.js
@@ -4,7 +4,7 @@
 
 (function($) {
 	$.entwine('ss', function($){
-		$('#cms-content-tools #Form_SearchForm').entwine({
+		$('.cms-content-tools #Form_SearchForm').entwine({
 			onsubmit: function(e) {
 				//We need to trigger handleStateChange() explicitly, otherwise handleStageChange()
 				//doesn't called if landing from another section of cms
diff --git a/admin/templates/Includes/ModelAdmin_Tools.ss b/admin/templates/Includes/ModelAdmin_Tools.ss
index b0882b070..0853391b8 100644
--- a/admin/templates/Includes/ModelAdmin_Tools.ss
+++ b/admin/templates/Includes/ModelAdmin_Tools.ss
@@ -1,4 +1,4 @@
-<div class="cms-content-tools west cms-panel cms-panel-layout collapsed" id="cms-content-tools" data-expandOnClick="true" data-layout-type="border">
+<div class="cms-content-tools west cms-panel cms-panel-layout" id="cms-content-tools-ModelAdmin" data-expandOnClick="true" data-layout-type="border">
 	<div class="cms-panel-content center">
 		<h3 class="cms-panel-header"><% _t('FILTER', 'Filter') %></h3>
 		$SearchForm