diff --git a/includes/VectorTemplate.php b/includes/VectorTemplate.php
index 0c80f1d..4cd9fac 100644
--- a/includes/VectorTemplate.php
+++ b/includes/VectorTemplate.php
@@ -131,11 +131,12 @@ class VectorTemplate extends BaseTemplate {
 				'html-personal-menu' => $this->renderNavigation( [ 'PERSONAL' ] ),
 				'html-navigation-left-tabs' => $this->renderNavigation( [ 'NAMESPACES', 'VARIANTS' ] ),
 				'html-navigation-right-tabs' => $this->renderNavigation( [ 'VIEWS', 'ACTIONS', 'SEARCH' ] ),
-				'html-logo' => '<div id="p-logo" role="banner"><a class="mw-wiki-logo" href="' .
-					htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] ) .
-					'"' .
-					Xml::expandAttributes( Linker::tooltipAndAccesskeyAttribs( 'p-logo' ) ) .
-					'></a></div>',
+				'html-logo-attributes' => Xml::expandAttributes(
+					Linker::tooltipAndAccesskeyAttribs( 'p-logo' ) + [
+						'class' => 'mw-wiki-logo',
+						'href' => Skin::makeMainPageUrl(),
+					]
+				),
 				'html-portals' => $this->renderPortals( $this->data['sidebar'] ),
 			] ),
 		];
diff --git a/includes/templates/Navigation.mustache b/includes/templates/Navigation.mustache
index 54568eb..ee0d23d 100644
--- a/includes/templates/Navigation.mustache
+++ b/includes/templates/Navigation.mustache
@@ -19,7 +19,9 @@
         </div>
     </div>
     <div id="mw-panel">
-        {{{html-logo}}}
+        <div id="p-logo" role="banner">
+            <a {{{html-logo-attributes}}}></a>
+        </div>
         {{{html-portals}}}
     </div>
 </div>