diff --git a/admin-dev/themes/template/header.tpl b/admin-dev/themes/template/header.tpl
index 3f0cc2929..0d219ad54 100644
--- a/admin-dev/themes/template/header.tpl
+++ b/admin-dev/themes/template/header.tpl
@@ -223,13 +223,13 @@ $(document).ready(function()
 		</div>
 		<div id="header_quick">
 		<script type="text/javascript">
-		function quickSelect(elt)
-		{
-			var eltVal = $(elt).val();
-			if (eltVal == "0") return false;
-			else if (eltVal.substr(eltVal.length - 6) == "_blank") window.open(eltVal.substr(0, eltVal.length - 6)+'&token={$token}', "_blank");
-			else location.href = eltVal+'&token={$token}';
-		}
+			function quickSelect(elt)
+			{
+				var eltVal = $(elt).val();
+				if (eltVal == "0") return false;
+				else if (eltVal.substr(eltVal.length - 6) == '_blank') window.open(eltVal.substr(0, eltVal.length - 6), '_blank');
+				else location.href = eltVal;
+			}
 		</script>
 		<select onchange="quickSelect(this);" id="quick_select">
 			<option value="0">{l s='Quick Access'}</option>
diff --git a/classes/AdminController.php b/classes/AdminController.php
index d0e12d775..dc4b47572 100644
--- a/classes/AdminController.php
+++ b/classes/AdminController.php
@@ -1089,7 +1089,7 @@ class AdminControllerCore extends Controller
 		$quick_access = QuickAccess::getQuickAccesses($this->context->language->id);
 		foreach ($quick_access as $index => $quick)
 		{
-			preg_match('/tab=(.+)(&.+)?$/', $quick['link'], $admin_tab);
+			preg_match('/controller=(.+)(&.+)?$/', $quick['link'], $admin_tab);
 			if (isset($admin_tab[1]))
 			{
 				if (strpos($admin_tab[1], '&'))