diff --git a/src/Core/Form/ChoiceProvider/ModuleByNameChoiceProvider.php b/src/Core/Form/ChoiceProvider/ModuleByNameChoiceProvider.php
index 74d3e3a7b1c5d..c6391821c4c47 100644
--- a/src/Core/Form/ChoiceProvider/ModuleByNameChoiceProvider.php
+++ b/src/Core/Form/ChoiceProvider/ModuleByNameChoiceProvider.php
@@ -60,6 +60,9 @@ public function getChoices()
             $moduleChoices[$module->get('displayName')] = $module->get('name');
         }
 
+        // Order modules alphabetically
+        ksort($moduleChoices);
+
         return $moduleChoices;
     }
 }