diff --git a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_TreeView.ss b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_TreeView.ss
index bad37c6c..888d85aa 100644
--- a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_TreeView.ss
+++ b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_TreeView.ss
@@ -6,31 +6,12 @@
 
 $ExtraTreeTools
 
-<div class="flexbox-area-grow">
-	<% if $TreeIsFiltered %>
-	<div class="cms-tree-filtered cms-notice">
-		<strong><% _t('CMSMain.TreeFiltered', 'Showing search results.') %></strong>
-		<a href="javascript:void(0)" class="clear-filter">
-			<% _t('CMSMain.TreeFilteredClear', 'Clear') %>
-		</a>
-
-		<div class="cms-tree <% if $TreeIsFiltered %>filtered-list<% end_if %>"
-			data-url-tree="$LinkWithSearch($Link(getsubtree)).ATT"
-			data-url-savetreenode="$Link(savetreenode).ATT"
-			data-url-updatetreenodes="$Link(updatetreenodes).ATT"
-			data-url-addpage="{$LinkPageAdd('AddForm/?action_doAdd=1', 'ParentID=%s&amp;PageType=%s').ATT}"
-			data-url-editpage="$LinkPageEdit('%s').ATT"
-			data-url-duplicate="{$Link('duplicate/%s').ATT}"
-			data-url-duplicatewithchildren="{$Link('duplicatewithchildren/%s').ATT}"
-			data-url-listview="{$Link('?view=list').ATT}"
-			data-hints="$SiteTreeHints.ATT"
-			data-childfilter="$Link('childfilter').ATT"
-			data-extra-params="SecurityID=$SecurityID.ATT">
-			$SiteTreeAsUL
-	</div>
-	</div>
-
-	<% else %>
+<% if $TreeIsFiltered %>
+<div class="cms-tree-filtered cms-notice flexbox-area-grow">
+	<strong><% _t('CMSMain.TreeFiltered', 'Showing search results.') %></strong>
+	<a href="javascript:void(0)" class="clear-filter">
+		<% _t('CMSMain.TreeFilteredClear', 'Clear') %>
+	</a>
 
 	<div class="cms-tree <% if $TreeIsFiltered %>filtered-list<% end_if %>"
 		data-url-tree="$LinkWithSearch($Link(getsubtree)).ATT"
@@ -46,6 +27,23 @@ $ExtraTreeTools
 		data-extra-params="SecurityID=$SecurityID.ATT">
 		$SiteTreeAsUL
 	</div>
-
-	<% end_if %>
 </div>
+
+<% else %>
+
+<div class="cms-tree flexbox-area-grow <% if $TreeIsFiltered %>filtered-list<% end_if %>"
+	data-url-tree="$LinkWithSearch($Link(getsubtree)).ATT"
+	data-url-savetreenode="$Link(savetreenode).ATT"
+	data-url-updatetreenodes="$Link(updatetreenodes).ATT"
+	data-url-addpage="{$LinkPageAdd('AddForm/?action_doAdd=1', 'ParentID=%s&amp;PageType=%s').ATT}"
+	data-url-editpage="$LinkPageEdit('%s').ATT"
+	data-url-duplicate="{$Link('duplicate/%s').ATT}"
+	data-url-duplicatewithchildren="{$Link('duplicatewithchildren/%s').ATT}"
+	data-url-listview="{$Link('?view=list').ATT}"
+	data-hints="$SiteTreeHints.ATT"
+	data-childfilter="$Link('childfilter').ATT"
+	data-extra-params="SecurityID=$SecurityID.ATT">
+	$SiteTreeAsUL
+</div>
+
+<% end_if %>