diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_autogen_m.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_autogen_m.tmpl
index 2bbbf5646..2e5932ce2 100644
--- a/docs/upgrades/templates-6.99.0/wgtemplate_autogen_m.tmpl
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_autogen_m.tmpl
@@ -11,8 +11,7 @@
 <span class="horizontalMenu">
 <tmpl_loop page_loop>
 <a class="horizontalMenu" 
-   <tmpl_if page.newWindow>target="_blank"</tmpl_if>
-   href="<tmpl_var page.url>"><tmpl_var page.menuTitle></a>
+   <tmpl_if page.newWindow>onclick="window.open('<tmpl_var page.url>')" href="#" <tmpl_else>href="<tmpl_var page.url>"</tmpl_if>><tmpl_var page.menuTitle></a>
    <tmpl_unless "__last__"> &middot; </tmpl_unless>
 </tmpl_loop>
 </span>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_autogen_t.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_autogen_t.tmpl
index 00f13283a..c3738d799 100644
--- a/docs/upgrades/templates-6.99.0/wgtemplate_autogen_t.tmpl
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_autogen_t.tmpl
@@ -11,8 +11,7 @@
 <span class="horizontalMenu">
 <tmpl_loop page_loop>
 <a class="horizontalMenu"
-   <tmpl_if page.newWindow></tmpl_if>
-   href="<tmpl_var page.url>"><tmpl_var page.menuTitle></a>
+   <tmpl_if page.newWindow>onclick="window.open('<tmpl_var page.url>')" href="#" <tmpl_else>href="<tmpl_var page.url>"</tmpl_if>><tmpl_var page.menuTitle></a>
    <tmpl_unless "__last__"> &middot; </tmpl_unless>
 </tmpl_loop>
 </span>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_crumbtrail.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_crumbtrail.tmpl
index 7f3a22548..d694b40bc 100644
--- a/docs/upgrades/templates-6.99.0/wgtemplate_crumbtrail.tmpl
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_crumbtrail.tmpl
@@ -11,8 +11,7 @@
 <span class="crumbTrail">
 <tmpl_loop page_loop>
 <a class="crumbTrail" 
-   <tmpl_if page.newWindow></tmpl_if>
-   href="<tmpl_var page.url>"><tmpl_var page.menuTitle></a>
+    <tmpl_if page.newWindow>onclick="window.open('<tmpl_var page.url>')" href="#" <tmpl_else>href="<tmpl_var page.url>"</tmpl_if>><tmpl_var page.menuTitle></a>
    <tmpl_unless "__last__"> &gt; </tmpl_unless>
 </tmpl_loop>
 </span>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_horizontalmenu.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_horizontalmenu.tmpl
index b2525f286..d0edca9ff 100644
--- a/docs/upgrades/templates-6.99.0/wgtemplate_horizontalmenu.tmpl
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_horizontalmenu.tmpl
@@ -10,9 +10,7 @@
 </tmpl_if>
 <span class="horizontalMenu">
 <tmpl_loop page_loop>
-<a class="horizontalMenu" 
-   <tmpl_if page.newWindow></tmpl_if>
-   href="<tmpl_var page.url>"><tmpl_var page.menuTitle></a>
+<a class="horizontalMenu" <tmpl_if page.newWindow>onclick="window.open('<tmpl_var page.url>')" href="#" <tmpl_else>href="<tmpl_var page.url>"</tmpl_if>><tmpl_var page.menuTitle></a>
    <tmpl_unless "__last__"> &middot; </tmpl_unless>
 </tmpl_loop>
 </span>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_tabs.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_tabs.tmpl
index 24db6ee3c..65ab44ada 100644
--- a/docs/upgrades/templates-6.99.0/wgtemplate_tabs.tmpl
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_tabs.tmpl
@@ -14,6 +14,6 @@
    <tmpl_else>
       <span class="rootTabOff">
    </tmpl_if>
-   <a <tmpl_if page.newWindow></tmpl_if> href="<tmpl_var page.url>"><tmpl_var page.menuTitle></a>
+   <a  <tmpl_if page.newWindow>onclick="window.open('<tmpl_var page.url>')" href="#" <tmpl_else>href="<tmpl_var page.url>"</tmpl_if>><tmpl_var page.menuTitle></a>
    </span>
 </tmpl_loop>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_verticalmenu.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_verticalmenu.tmpl
index 477f9e115..2695a8419 100644
--- a/docs/upgrades/templates-6.99.0/wgtemplate_verticalmenu.tmpl
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_verticalmenu.tmpl
@@ -11,7 +11,7 @@
 <span class="verticalMenu">
 <tmpl_loop page_loop>
 <tmpl_var page.indent>
-	<a <tmpl_if page.isCurrent>class="selectedMenuItem"</tmpl_if> <tmpl_if page.newWindow></tmpl_if> href="<tmpl_var page.url>"><tmpl_var page.menuTitle></a>
+	<a <tmpl_if page.isCurrent>class="selectedMenuItem"</tmpl_if> <tmpl_if page.newWindow>onclick="window.open('<tmpl_var page.url>')" href="#" <tmpl_else>href="<tmpl_var page.url>"</tmpl_if>><tmpl_var page.menuTitle></a>
 	<br />		
 </tmpl_loop>
 </span>