diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php
index e4c9eed3..b22bf414 100644
--- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php
+++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php
@@ -1133,10 +1133,16 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface
 
 		$doc->addScriptDeclaration("
 			document.addEventListener('DOMContentLoaded', function() {
+				var url = " . json_encode($supportUrl) . ";
 				document.querySelectorAll('a[href*=\"help.joomla.org\"], a[href*=\"docs.joomla.org\"]').forEach(function(link) {
-					link.href = " . json_encode($supportUrl) . ";
+					link.href = url;
 					link.target = '_blank';
 				});
+				document.querySelectorAll('a[href*=\"dashboard=help\"]').forEach(function(link) {
+					link.href = url;
+					link.target = '_blank';
+					link.rel = 'noopener noreferrer';
+				});
 			});
 		");
 	}