diff --git a/installation/CHANGELOG b/installation/CHANGELOG
index 0c8d9bf10c59c..cc7899b11c81a 100644
--- a/installation/CHANGELOG
+++ b/installation/CHANGELOG
@@ -32,6 +32,7 @@ $ -> Language fix or change
  # [#31831] Beez3: image overflow.  Thanks Tobias Zulauf
  $# [#31699] Remove last uses of JDispatcher.  Thanks George Wilson
  ^ [#31629] Fix https problem if you are using Google Fonts protostar Template.  Thanks Ervis Tusha
+ ^ [#30718] minor code optimization: libraries/legacy/html/menu.php.  Thanks Jan Schönherr
 
 23-Aug-2013 Jean-Marie Simonet
  # Reverting [#31641] which breaks Notices (File Type error message not displayed)
diff --git a/libraries/cms/html/menu.php b/libraries/cms/html/menu.php
index 4a2e2e98ca0a9..11613d1a54bc5 100644
--- a/libraries/cms/html/menu.php
+++ b/libraries/cms/html/menu.php
@@ -70,15 +70,10 @@ public static function menuitems($config = array())
 	{
 		if (empty(static::$items))
 		{
+			$menus = static::menus();
+
 			$db = JFactory::getDbo();
 			$query = $db->getQuery(true)
-				->select('menutype AS value, title AS text')
-				->from($db->quoteName('#__menu_types'))
-				->order('title');
-			$db->setQuery($query);
-			$menus = $db->loadObjectList();
-
-			$query->clear()
 				->select('a.id AS value, a.title AS text, a.level, a.menutype')
 				->from('#__menu AS a')
 				->where('a.parent_id > 0')