diff --git a/libraries/src/Router/SiteRouter.php b/libraries/src/Router/SiteRouter.php
index 6dbabc1ea02a2..db2f07b997b18 100644
--- a/libraries/src/Router/SiteRouter.php
+++ b/libraries/src/Router/SiteRouter.php
@@ -723,6 +723,13 @@ protected function createUri($url)
 				{
 					$uri->setVar('Itemid', $itemid);
 				}
+			} else {
+				$item = $this->menu->getItem($this->getVar('Itemid'));
+
+				if ($item !== null && $item->component === $uri->getVar('option'))
+				{
+					$uri->setVar('Itemid', $item->id);
+				}
 			}
 		}
 		else