diff --git a/classes/Tab.php b/classes/Tab.php
index db529cf7b..14b8a49f0 100644
--- a/classes/Tab.php
+++ b/classes/Tab.php
@@ -139,7 +139,11 @@ class TabCore extends ObjectModel
 	 */
 	public static function getCurrentTabId()
 	{
-		return Tab::getIdFromClassName(Tools::getValue('tab'));
+		$id_tab = Tab::getIdFromClassName(Tools::getValue('controller'));
+		// retro-compatibility 1.4/1.5 
+		if (empty ($id_tab))
+			$id_tab = Tab::getIdFromClassName(Tools::getValue('tab'));
+		return $id_tab;
 	}
 
 	/**