diff --git a/app/javascript/components/components/AddComponentModal.vue b/app/javascript/components/components/AddComponentModal.vue
index f9417af2..f915a26b 100644
--- a/app/javascript/components/components/AddComponentModal.vue
+++ b/app/javascript/components/components/AddComponentModal.vue
@@ -35,6 +35,7 @@
                 v-model="search"
                 :list="addDisplayNameToComponents(available_components)"
                 :filter-by-query="true"
+                :max-suggestions="0"
                 value-attribute="id"
                 display-attribute="displayed"
                 placeholder="Search for a component by name..."
diff --git a/app/javascript/components/project/Project.vue b/app/javascript/components/project/Project.vue
index 01b0a07c..7456e3cb 100644
--- a/app/javascript/components/project/Project.vue
+++ b/app/javascript/components/project/Project.vue
@@ -400,7 +400,11 @@ export default {
       });
     },
     sortedAvailableComponents: function () {
-      return _.sortBy(this.project.available_components, ["child_project_name"], ["asc"]);
+      return _.sortBy(
+        this.project.available_components,
+        [(component) => component.name.toLowerCase(), "version", "release"],
+        ["asc"]
+      );
     },
     uniqueComponentNames: function () {
       return _.uniq(this.sortedComponents().map((c) => c["name"]));