diff --git a/classes/Module.php b/classes/Module.php
index ed996ecce..660d0edaa 100644
--- a/classes/Module.php
+++ b/classes/Module.php
@@ -1050,6 +1050,15 @@ abstract class ModuleCore
 
 		//echo round($current_memory / 1024 / 1024, 2).'Mo<br />';
 
+		// @TODO review
+		function sortModules($a, $b)
+		{
+			if ($a->displayName == $b->displayName)
+				return 0;
+			return ($a->displayName < $b->displayName) ? -1 : 1;
+		}
+		usort($moduleList, "sortModules");
+
 		if ($errors)
 		{
 			echo '<div class="alert error"><h3>'.Tools::displayError('The following module(s) couldn\'t be loaded').':</h3><ol>';
diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php
index b3321bb09..763045891 100644
--- a/controllers/admin/AdminModulesController.php
+++ b/controllers/admin/AdminModulesController.php
@@ -234,7 +234,7 @@ class AdminModulesControllerCore extends AdminController
 
 		$this->initContent();
 		$this->context->smarty->display('modules/list.tpl');
-		die('OK');
+		exit;
 	}
 
 	public function ajaxProcessSetFilter()