diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php
index 218a6450a..b3321bb09 100644
--- a/controllers/admin/AdminModulesController.php
+++ b/controllers/admin/AdminModulesController.php
@@ -811,6 +811,10 @@ class AdminModulesControllerCore extends AdminController
 		// Adding Css
 		$this->addCSS(__PS_BASE_URI__.str_replace(_PS_ROOT_DIR_.DIRECTORY_SEPARATOR, '', _PS_ADMIN_DIR_).'/themes/default/modules.css', 'all');
 
+		// If we are on a module configuration, no need to load all modules
+		if (Tools::getValue('configure') != '')
+			return true;
+
 		// Init
 		$smarty = $this->context->smarty;
 		$autocompleteList = 'var moduleList = [';