diff --git a/code/controllers/AssetAdmin.php b/code/controllers/AssetAdmin.php
index 893e400e..94ed93b5 100644
--- a/code/controllers/AssetAdmin.php
+++ b/code/controllers/AssetAdmin.php
@@ -304,7 +304,7 @@ JS
 		foreach($context->getFields() as $field) $field->setName(sprintf('q[%s]', $field->getName()));
 		foreach($context->getFilters() as $filter) $filter->setFullName(sprintf('q[%s]', $filter->getFullName()));
 
-		// Customize fields		
+		// Customize fields
 		$appCategories = array(
 			'image' => _t('AssetAdmin.AppCategoryImage', 'Image'),
 			'audio' => _t('AssetAdmin.AppCategoryAudio', 'Audio'),
@@ -313,17 +313,17 @@ JS
 			'zip' => _t('AssetAdmin.AppCategoryArchive', 'Archive', 'A collection of files'),
 		);
 		$context->addField(
-			new DropdownField(
+			$typeDropdown = new DropdownField(
 				'q[AppCategory]',
 				_t('AssetAdmin.Filetype', 'File type'),
-				$appCategories,
-				null,
-				null,
-				' '
+				$appCategories
 			)
 		);
+
+		$typeDropdown->setEmptyString(' ');
+
 		$context->addField(
-			new CheckboxField('q[CurrentFolderOnly]' ,_t('AssetAdmin.CurrentFolderOnly', 'Limit to current folder?'))
+			new CheckboxField('q[CurrentFolderOnly]', _t('AssetAdmin.CurrentFolderOnly', 'Limit to current folder?'))
 		);
 		$context->getFields()->removeByName('q[Title]');
 
diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php
index fefddbe6..9729d3c4 100644
--- a/code/controllers/CMSMain.php
+++ b/code/controllers/CMSMain.php
@@ -280,23 +280,21 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 				$dateTo = new DateField('q[LastEditedTo]', _t('CMSSearch.FILTERDATETO', 'To'))
 			),
 			new DropdownField(
-				'q[FilterClass]', 
-				_t('CMSMain.PAGES', 'Pages'), 
+				'q[FilterClass]',
+				_t('CMSMain.PAGES', 'Pages'),
 				$filterMap
 			),
-			new DropdownField(
-				'q[ClassName]', 
-				_t('CMSMain.PAGETYPEOPT','Page Type', 'Dropdown for limiting search to a page type'), 
-				$pageTypes, 
-				null, 
-				null, 
-				_t('CMSMain.PAGETYPEANYOPT','Any')
+			$classDropdown = new DropdownField(
+				'q[ClassName]',
+				_t('CMSMain.PAGETYPEOPT','Page Type', 'Dropdown for limiting search to a page type'),
+				$pageTypes
 			)
 			// new TextField('MetaTags', _t('CMSMain.SearchMetaTags', 'Meta tags'))
 		);
 		$dateGroup->subfieldParam = 'FieldHolder';
 		$dateFrom->setConfig('showcalendar', true);
 		$dateTo->setConfig('showcalendar', true);
+		$classDropdown->setEmptyString(_t('CMSMain.PAGETYPEANYOPT','Any'));
 
 		$actions = new FieldList(
 			FormAction::create('doSearch',  _t('CMSMain_left.ss.APPLY FILTER', 'Apply Filter'))