diff --git a/admin-dev/themes/default/template/controllers/modules/js.tpl b/admin-dev/themes/default/template/controllers/modules/js.tpl
index e64c954ad..54cfdb273 100644
--- a/admin-dev/themes/default/template/controllers/modules/js.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/js.tpl
@@ -176,7 +176,7 @@
 				{
 					// res.status  = cache or refresh
 					if (data == '{"status":"refresh"}')
-						window.location.href = currentIndexWithToken;
+						window.location.href = window.location.href;
 				},
 				error: function(res,textStatus,jqXHR)
 				{
diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php
index 2ecf2fa58..46fa510f6 100644
--- a/controllers/admin/AdminModulesController.php
+++ b/controllers/admin/AdminModulesController.php
@@ -849,6 +849,11 @@ class AdminModulesControllerCore extends AdminController
 			return true;
 
 
+		// If action on module, we display it
+		if (Tools::getValue('module_name') != '' && Tools::getValue('module_name') == $module->name)
+			return false;
+
+
 		// Filter on module name
 		$filter_name = Tools::getValue('filtername');
 		if (!empty($filter_name))