diff --git a/templates/Includes/AssetAdmin_Tools.ss b/templates/Includes/AssetAdmin_Tools.ss
index 60f1c4a7..d36a13d7 100644
--- a/templates/Includes/AssetAdmin_Tools.ss
+++ b/templates/Includes/AssetAdmin_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 collapsed" id="cms-content-tools-AssetAdmin" data-expandOnClick="true" data-layout-type="border">
 	<div class="cms-panel-content center">
 		<h3 class="cms-panel-header"><% _t('FILTER', 'Filter') %></h3>
 		$SearchForm
diff --git a/templates/Includes/CMSMain_Tools.ss b/templates/Includes/CMSMain_Tools.ss
index d2b23861..10479466 100644
--- a/templates/Includes/CMSMain_Tools.ss
+++ b/templates/Includes/CMSMain_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" id="cms-content-tools-CMSMain">
+<div class="cms-content-tools west cms-panel cms-panel-layout" data-expandOnClick="true" data-layout-type="border" id="cms-content-tools-CMSMain">
 	<div class="cms-panel-content center">
 		<div class="cms-content-view cms-tree-view-sidebar cms-panel-deferred" id="cms-content-treeview" data-url="$LinkTreeView">
 			<%-- Lazy-loaded via ajax --%>
diff --git a/templates/Includes/CMSPagesController_Tools.ss b/templates/Includes/CMSPagesController_Tools.ss
index 477ea3b4..dc683273 100644
--- a/templates/Includes/CMSPagesController_Tools.ss
+++ b/templates/Includes/CMSPagesController_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" id="cms-content-tools-CMSPagesController">
+<div class="cms-content-tools west cms-panel cms-panel-layout collapsed" data-expandOnClick="true" data-layout-type="border" id="cms-content-tools-CMSPagesController">
 	<div class="cms-panel-content center">
 		<h3 class="cms-panel-header"><% _t('FILTER', 'Filter') %></h3>
 		$SearchForm