diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php
index e4ea7b8b7..df43f2572 100644
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -999,6 +999,10 @@ class admin_shortcodes extends e_shortcode
 
 			$active = ($var === $current) ? ' active bg-default' : '';
 
+			$srch = array('[',']','!');
+			$repl = array('[',']','!');
+			$link = str_replace($srch,$repl,$link);
+
 			$text .= '<li role="menuitem" class="text-right'.$active.'">
 				<a href="'.$link.'">'.$label;
 
diff --git a/e107_core/templates/admin_template.php b/e107_core/templates/admin_template.php
index eb543d7f5..bbbd9cf2d 100644
--- a/e107_core/templates/admin_template.php
+++ b/e107_core/templates/admin_template.php
@@ -301,14 +301,14 @@ $ADMIN_TEMPLATE['menu']['start'] = '
 
 $ADMIN_TEMPLATE['menu']['button'] = '
 	<li>
-		<a class="link{LINK_CLASS}" {LINK_DATA} href="{LINK_URL}" {ID}{ONCLICK}><span class="e-tip" data-placement="right" title="{LINK_TEXT}">{LINK_IMAGE}</span><span class="sidebar-toggle-panel"> {LINK_TEXT}{LINK_BADGE}{LINK_CARET}</span></a>
+		<a id="plugin-navigation-{LINK_ID}" class="link{LINK_CLASS}" {LINK_DATA} href="{LINK_URL}" {ID}{ONCLICK}><span class="e-tip" data-placement="right" title="{LINK_TEXT}">{LINK_IMAGE}</span><span class="sidebar-toggle-panel"> {LINK_TEXT}{LINK_BADGE}{LINK_CARET}</span></a>
 		{SUB_MENU}
 	</li>
 ';
 
 $ADMIN_TEMPLATE['menu']['button_active'] = '
 	<li class="active">
-		<a class="link-active{LINK_CLASS}" {LINK_DATA} href="{LINK_URL}" {ID}{ONCLICK}><span class="e-tip" data-placement="right" title="{LINK_TEXT}">{LINK_IMAGE}</span><span class="sidebar-toggle-panel"> {LINK_TEXT}{LINK_BADGE}{LINK_CARET}</span></a>
+		<a id="plugin-navigation-{LINK_ID}" class="link-active{LINK_CLASS}" {LINK_DATA} href="{LINK_URL}" {ID}{ONCLICK}><span class="e-tip" data-placement="right" title="{LINK_TEXT}">{LINK_IMAGE}</span><span class="sidebar-toggle-panel"> {LINK_TEXT}{LINK_BADGE}{LINK_CARET}</span></a>
 		{SUB_MENU}
 	</li>
 ';