diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index a0247020..9dcc58bf 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -721,6 +721,8 @@ JS;
 			$newVersion = ((int)$record->Version) + 1;
 			FormResponse::add("\$('Form_EditForm_Version').value = {$newVersion};");
 			
+			$this->extend('onAfterSave', $record);
+			
 			// If the 'Save & Publish' button was clicked, also publish the page
 			if (isset($urlParams['publish']) && $urlParams['publish'] == 1) {
 				$record->doPublish();
diff --git a/javascript/CMSMain_left.js b/javascript/CMSMain_left.js
index f6cafe68..0b63a612 100755
--- a/javascript/CMSMain_left.js
+++ b/javascript/CMSMain_left.js
@@ -190,7 +190,7 @@ SiteTreeFilterForm.prototype = {
 		
 		if (filters.keys().length) {
 			// Set new URL
-			$('sitetree').setCustomURL(SiteTreeHandlers.controller_url + '/getfilteredsubtree', filters);
+			$('sitetree').setCustomURL(SiteTreeHandlers.controller_url + '/getfilteredsubtree?filter=CMSSiteTreeFilter_Search', filters);
 			
 			// Disable checkbox tree controls that currently don't work with search.
 			// @todo: Make them work together