diff --git a/components/Step.vue b/components/Step.vue
index 947d055b..aa113133 100644
--- a/components/Step.vue
+++ b/components/Step.vue
@@ -90,4 +90,14 @@
   function decrement_step() {
     stepper_tree.current_step_index--
   }
+
+  const sortedChips = computed(() => {
+    const chips = steps.value[props.step_index]?.chips || []
+    return [...chips].sort((a, b) =>
+      a.localeCompare(b, undefined, {
+        numeric: true,
+        sensitivity: "base",
+      }),
+    )
+  })
 </script>
diff --git a/components/Viewer/Tree/ObjectTree.vue b/components/Viewer/Tree/ObjectTree.vue
index 94eb56bd..bc98a635 100644
--- a/components/Viewer/Tree/ObjectTree.vue
+++ b/components/Viewer/Tree/ObjectTree.vue
@@ -9,7 +9,7 @@
     >
       <div class="scrollable-wrapper">
         <v-sheet
-          style="max-height: calc(90vh)"
+          style="max-height: calc(85vh)"
           class="transparent-treeview scrollbar-hover"
         >
           <v-row v-if="treeviewStore.items.length > 0">
diff --git a/stores/treeview.js b/stores/treeview.js
index 07ce7566..5de9da74 100644
--- a/stores/treeview.js
+++ b/stores/treeview.js
@@ -15,9 +15,16 @@ export const useTreeviewStore = defineStore("treeview", () => {
   function addItem(geodeObject, displayed_name, id, object_type) {
     dataStyleStore.addDataStyle(id, geodeObject, object_type)
     const child = { title: displayed_name, id, object_type }
+
     for (let i = 0; i < items.value.length; i++) {
       if (items.value[i].title === geodeObject) {
         items.value[i].children.push(child)
+        items.value[i].children.sort((a, b) =>
+          a.title.localeCompare(b.title, undefined, {
+            numeric: true,
+            sensitivity: "base",
+          }),
+        )
         selection.value.push(child)
         return
       }