diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js
index f03ddb2df1..f96a2770cf 100644
--- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js
+++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js
@@ -659,6 +659,9 @@
           type: type,
           label: label
         });
+        model.allowedBootSources.sort(function(a, b) {
+          return a.type > b.type;
+        });
       }
     }
 
diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.controller.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.controller.js
index 391b8e711b..8444d70983 100644
--- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.controller.js
+++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.controller.js
@@ -393,8 +393,7 @@
         return $scope.model.allowedBootSources;
       },
       function changeBootSource(newValue) {
-        if (angular.isArray(newValue) && newValue.length > 0 &&
-          !$scope.model.newInstanceSpec.source_type) {
+        if (angular.isArray(newValue) && newValue.length > 0) {
           updateBootSourceSelection(newValue[0].type);
           $scope.model.newInstanceSpec.source_type = newValue[0];
         }