diff --git a/templates/Includes/AssetAdmin_Content.ss b/templates/Includes/AssetAdmin_Content.ss
index fc6b5fd6..638f7239 100644
--- a/templates/Includes/AssetAdmin_Content.ss
+++ b/templates/Includes/AssetAdmin_Content.ss
@@ -20,14 +20,19 @@
 	</div>
 
 
-	<div class="cms-content-tools west">
-		<div class="cms-content-tools-actions ui-widget-content">
-			$AddForm
+	<div class="cms-content-tools cms-panel west" data-expandOnClick="true">
+		
+		<h3 class="cms-panel-header"></h3>
+	
+		<div class="cms-panel-content">
+			<div class="cms-content-tools-actions ui-widget-content">
+				$AddForm
+			</div>
+			<div class="cms-tree" data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)">
+				$SiteTreeAsUL
+			</div>
 		</div>
 		
-		<div class="cms-tree" data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)">
-			$SiteTreeAsUL
-		</div>
 	</div>
 
 	<div class="cms-content-form center">
diff --git a/templates/Includes/CMSPagesController_Content.ss b/templates/Includes/CMSPagesController_Content.ss
index 352e4e54..c6e8f03d 100644
--- a/templates/Includes/CMSPagesController_Content.ss
+++ b/templates/Includes/CMSPagesController_Content.ss
@@ -20,9 +20,13 @@
 		</div>
 	</div>
 
-	<div class="cms-content-tools west">
+	<div class="cms-content-tools west cms-panel" data-expandOnClick="true">
+		
+		<h3 class="cms-panel-header">Filter</h3>
 	
-		$SearchForm
+		<div class="cms-panel-content">
+			$SearchForm
+		</div>
 		
 	</div>