diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 52dc25dd452..c402353e8d7 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -156,6 +156,8 @@ class HookManager
         {
             if (! empty($modules))
             {
+            	$modulealreadyexecuted[$context]=array(); // Filter by context
+
                 foreach($modules as $module => $actionclassinstance)
                 {
                 	//print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction." result=".$result."<br>\n";
@@ -164,8 +166,8 @@ class HookManager
                 	// jump to next class if method does not exists
                     if (! method_exists($actionclassinstance,$method)) continue;
                 	// test to avoid to run twice a hook, when a module implements several active contexts
-                    if (in_array($module,$modulealreadyexecuted)) continue;
-                    $modulealreadyexecuted[$module]=$module;
+                    if (in_array($module,$modulealreadyexecuted[$context])) continue;
+                    $modulealreadyexecuted[$context][$module]=$module; // Use the $currentcontext in method for avoid to run twice
                     // Add current context for avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return;
                     $parameters['currentcontext'] = $context;
                     // Hooks that must return int (hooks with type 'addreplace')