diff --git a/administrator/components/com_modules/models/forms/filter_modules.xml b/administrator/components/com_modules/models/forms/filter_modules.xml
index 42c5061661ab5..0d49bfff5cb26 100644
--- a/administrator/components/com_modules/models/forms/filter_modules.xml
+++ b/administrator/components/com_modules/models/forms/filter_modules.xml
@@ -52,7 +52,6 @@
 			type="menuitem"
 			label="COM_MODULES_OPTION_SELECT_PAGE"
 			disable="separator,alias,heading,url"
-			showon="client_id:0"
 			onchange="this.form.submit();"
 			>
 			<option	value="">COM_MODULES_OPTION_SELECT_PAGE</option>
diff --git a/administrator/components/com_modules/views/modules/view.html.php b/administrator/components/com_modules/views/modules/view.html.php
index 9c37cae7f5d3e..51f05d3501b23 100644
--- a/administrator/components/com_modules/views/modules/view.html.php
+++ b/administrator/components/com_modules/views/modules/view.html.php
@@ -48,6 +48,13 @@ public function display($tpl = null)
 			return false;
 		}
 
+		// We do not need the Page filter when filtering by administrator
+		if ($this->state->get('client_id') == 1)
+		{
+			unset($this->activeFilters['menuitem']);
+			$this->filterForm->removeField('menuitem', 'filter');
+		}
+
 		// We don't need the toolbar in the modal window.
 		if ($this->getLayout() !== 'modal')
 		{