diff --git a/libraries/src/Component/Router/Rules/MenuRules.php b/libraries/src/Component/Router/Rules/MenuRules.php
index bb73065072b7a..6daa8f3a10298 100644
--- a/libraries/src/Component/Router/Rules/MenuRules.php
+++ b/libraries/src/Component/Router/Rules/MenuRules.php
@@ -212,7 +212,8 @@ protected function buildLookup($language = '*')
 
 					$layout = '';
 
-					if (isset($item->query['layout']))
+					// Checking if layout is default just to be safe
+					if (isset($item->query['layout']) || $item->query['layout'] == 'default')
 					{
 						$layout = ':' . $item->query['layout'];
 					}
@@ -256,7 +257,6 @@ protected function buildLookup($language = '*')
 						if (!isset($this->lookup[$language][$view . $layout]) || $item->language !== '*')
 						{
 							$this->lookup[$language][$view . $layout] = $item->id;
-							$this->lookup[$language][$view] = $item->id;
 						}
 					}
 				}