diff --git a/administrator/components/com_menus/Model/ItemsModel.php b/administrator/components/com_menus/Model/ItemsModel.php
index f86652d80b819..e4b87c1023258 100644
--- a/administrator/components/com_menus/Model/ItemsModel.php
+++ b/administrator/components/com_menus/Model/ItemsModel.php
@@ -58,7 +58,8 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu
 				'parent_id', 'a.parent_id',
 				'publish_up', 'a.publish_up',
 				'publish_down', 'a.publish_down',
-				'a.ordering'
+				'a.ordering',
+				'e.name', 'componentName'
 			);
 
 			$assoc = Associations::isEnabled();
@@ -499,6 +500,12 @@ protected function getListQuery()
 			$query->where('a.language = ' . $db->quote($language));
 		}
 
+		// Filter on componentName
+		if ($componentName = $this->getState('filter.componentName'))
+		{
+			$query->where($db->quoteName('e.name') . ' = ' . $db->quote($componentName));
+		}
+
 		// Add the list ordering clause.
 		$query->order($db->escape($this->getState('list.ordering', 'a.lft')) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
 
diff --git a/administrator/components/com_menus/forms/filter_items.xml b/administrator/components/com_menus/forms/filter_items.xml
index bd9a014647b16..799c2ee3346fe 100644
--- a/administrator/components/com_menus/forms/filter_items.xml
+++ b/administrator/components/com_menus/forms/filter_items.xml
@@ -75,6 +75,14 @@
 			>
 			<option value="">COM_MENUS_FILTER_SELECT_PARENT_MENU_ITEM</option>
 		</field>
+		<field
+			name="componentName"
+			type="componentscategory"
+			label="COM_MENUS_FILTER_COMPONENT_LABEL"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_MENUS_OPTION_SELECT_COMPONENT</option>
+		</field>
 	</fields>
 	<fields name="list">
 		<field
diff --git a/administrator/language/en-GB/en-GB.com_menus.ini b/administrator/language/en-GB/en-GB.com_menus.ini
index 6d4c94e8d3495..eee3b019bc1ac 100644
--- a/administrator/language/en-GB/en-GB.com_menus.ini
+++ b/administrator/language/en-GB/en-GB.com_menus.ini
@@ -53,6 +53,7 @@ COM_MENUS_FIELD_VALUE_NEW_WITH_NAV="New Window With Navigation"
 COM_MENUS_FIELD_VALUE_NEW_WITHOUT_NAV="New Without Navigation"
 COM_MENUS_FIELD_VALUE_PARENT="Parent"
 COM_MENUS_FIELDSET_RULES="Permissions"
+COM_MENUS_FILTER_COMPONENT_LABEL="Component"
 COM_MENUS_FILTER_PARENT_MENU_ITEM_LABEL="Parent Menu Item"
 COM_MENUS_FILTER_SELECT_PARENT_MENU_ITEM="- Select Parent Menu Item -"
 COM_MENUS_GRID_UNSET_LANGUAGE="Unset %s Default"