diff --git a/app/docker/views/services/create/includes/config.html b/app/docker/views/services/create/includes/config.html
index 8083ae2f2..eac52f780 100644
--- a/app/docker/views/services/create/includes/config.html
+++ b/app/docker/views/services/create/includes/config.html
@@ -10,7 +10,7 @@
       <div ng-repeat="config in formValues.Configs" style="margin-top: 2px;">
         <div class="input-group col-sm-4 input-group-sm">
           <span class="input-group-addon">config</span>
-          <select class="form-control" ng-model="config.model" ng-options="config.Name for config in availableConfigs">
+          <select class="form-control" ng-model="config.model" ng-options="config.Name for config in availableConfigs | orderBy: 'Name'">
             <option value="" selected="selected">Select a config</option>
           </select>
         </div>
diff --git a/app/docker/views/services/create/includes/secret.html b/app/docker/views/services/create/includes/secret.html
index aca1f5264..aa6a42375 100644
--- a/app/docker/views/services/create/includes/secret.html
+++ b/app/docker/views/services/create/includes/secret.html
@@ -15,7 +15,7 @@
       <div ng-repeat="secret in formValues.Secrets track by $index" style="margin-top: 4px;">
         <div class="input-group col-sm-4 input-group-sm">
           <span class="input-group-addon">secret</span>
-          <select class="form-control" ng-model="secret.model" ng-options="secret.Name for secret in availableSecrets">
+          <select class="form-control" ng-model="secret.model" ng-options="secret.Name for secret in availableSecrets | orderBy: 'Name'">
             <option value="" selected="selected">Select a secret</option>
           </select>
         </div>
diff --git a/app/docker/views/services/edit/includes/configs.html b/app/docker/views/services/edit/includes/configs.html
index db36d0edb..21e4805ba 100644
--- a/app/docker/views/services/edit/includes/configs.html
+++ b/app/docker/views/services/edit/includes/configs.html
@@ -5,7 +5,7 @@
     <rd-widget-body classes="no-padding">
       <div class="form-inline" style="padding: 10px;">
         Add a config:
-        <select class="form-control" ng-options="config.Name for config in configs" ng-model="newConfig">
+        <select class="form-control" ng-options="config.Name for config in configs | orderBy: 'Name'" ng-model="newConfig">
           <option selected disabled hidden value="">Select a config</option>
         </select>
         <a class="btn btn-default btn-sm" ng-click="addConfig(service, newConfig)">
diff --git a/app/docker/views/services/edit/includes/secrets.html b/app/docker/views/services/edit/includes/secrets.html
index 04444aa6d..b6e680881 100644
--- a/app/docker/views/services/edit/includes/secrets.html
+++ b/app/docker/views/services/edit/includes/secrets.html
@@ -5,7 +5,7 @@
     <rd-widget-body classes="no-padding">
       <div class="form-inline" style="padding: 10px;">
         Add a secret:
-        <select class="form-control" ng-options="secret.Name for secret in secrets" ng-model="state.addSecret.secret">
+        <select class="form-control" ng-options="secret.Name for secret in secrets | orderBy: 'Name'" ng-model="state.addSecret.secret">
           <option selected disabled hidden value="">Select a secret</option>
         </select>
         <div class="form-group" ng-if="applicationState.endpoint.apiVersion >= 1.30 && state.addSecret.override">