diff --git a/libraries/src/Router/SiteRouter.php b/libraries/src/Router/SiteRouter.php
index 6dbabc1ea02a2..183c5e840bd67 100644
--- a/libraries/src/Router/SiteRouter.php
+++ b/libraries/src/Router/SiteRouter.php
@@ -724,6 +724,14 @@ protected function createUri($url)
 					$uri->setVar('Itemid', $itemid);
 				}
 			}
+			else
+			{
+				// If option matches, inherit current Itemid
+				if ($this->getVar('option') === $uri->getVar('option') && ($itemid = $this->getVar('Itemid')))
+				{
+					$uri->setVar('Itemid', $itemid);
+				}
+			}
 		}
 		else
 		{