diff --git a/administrator/components/com_menus/helpers/menus.php b/administrator/components/com_menus/helpers/menus.php
index 9df1c350c4add..4159d5aabc300 100644
--- a/administrator/components/com_menus/helpers/menus.php
+++ b/administrator/components/com_menus/helpers/menus.php
@@ -181,7 +181,7 @@ public static function getMenuLinks($menuType = null, $parentId = 0, $mode = 0,
 					  a.lft')
 			->from('#__menu AS a');
 
-		$query->select('e.name as componentname')
+		$query->select('e.name as componentname, e.element')
 			->join('left', '#__extensions e ON e.extension_id = a.component_id');
 
 		if (JLanguageMultilang::isEnabled())
diff --git a/administrator/components/com_menus/views/item/tmpl/edit_container.php b/administrator/components/com_menus/views/item/tmpl/edit_container.php
index 88aab4c2381a5..cbc3edf910ae8 100644
--- a/administrator/components/com_menus/views/item/tmpl/edit_container.php
+++ b/administrator/components/com_menus/views/item/tmpl/edit_container.php
@@ -92,7 +92,7 @@
 
 					foreach ($menuLinks as $i => $link) : ?>
 						<?php
-						if ($extension = $link->componentname):
+						if ($extension = $link->element):
 							$lang->load("$extension.sys", JPATH_ADMINISTRATOR, null, false, true)
 							|| $lang->load("$extension.sys", JPATH_ADMINISTRATOR . '/components/' . $extension, null, false, true);
 						endif;