diff --git a/src/frontend/src/components/nav/NavigationTree.tsx b/src/frontend/src/components/nav/NavigationTree.tsx
index c93577b9eb..ff2eb3a42d 100644
--- a/src/frontend/src/components/nav/NavigationTree.tsx
+++ b/src/frontend/src/components/nav/NavigationTree.tsx
@@ -9,6 +9,7 @@ import {
   type RenderTreeNodePayload,
   Space,
   Stack,
+  Text,
   TextInput,
   Tree,
   type TreeNodeData,
@@ -176,7 +177,7 @@ export default function NavigationTree({
         label: (
           <Group gap='xs'>
             <ApiIcon name={raw.icon} />
-            {raw.name}
+            <Text>{raw.name}</Text>
           </Group>
         ),
         value: raw.pk.toString(),
@@ -216,7 +217,7 @@ export default function NavigationTree({
       // After fetching (or in search mode where all data is already present), use actual children.
       const hasChildren: boolean =
         !debouncedSearch && !isFetched
-          ? !!resolveItem(payload.node, childIdentifier ?? '')
+          ? !!(childIdentifier && resolveItem(payload.node, childIdentifier))
           : nodeInfo.children.length > 0;
 
       return (
diff --git a/src/frontend/src/pages/part/CategoryDetail.tsx b/src/frontend/src/pages/part/CategoryDetail.tsx
index 4c47958da5..9d0077e9c8 100644
--- a/src/frontend/src/pages/part/CategoryDetail.tsx
+++ b/src/frontend/src/pages/part/CategoryDetail.tsx
@@ -377,6 +377,7 @@ export default function CategoryDetail() {
             modelType={ModelType.partcategory}
             title={t`Part Categories`}
             endpoint={ApiEndpoints.category_tree}
+            childIdentifier='subcategories'
             opened={treeOpen}
             onClose={() => {
               setTreeOpen(false);
diff --git a/src/frontend/src/pages/stock/LocationDetail.tsx b/src/frontend/src/pages/stock/LocationDetail.tsx
index 5fbab60d46..0b13ba9f23 100644
--- a/src/frontend/src/pages/stock/LocationDetail.tsx
+++ b/src/frontend/src/pages/stock/LocationDetail.tsx
@@ -514,6 +514,7 @@ export default function Stock() {
             title={t`Stock Locations`}
             modelType={ModelType.stocklocation}
             endpoint={ApiEndpoints.stock_location_tree}
+            childIdentifier='sublocations'
             opened={treeOpen}
             onClose={() => setTreeOpen(false)}
             selectedId={location?.pk}
diff --git a/src/frontend/src/pages/stock/StockDetail.tsx b/src/frontend/src/pages/stock/StockDetail.tsx
index 451b787afa..5d73866074 100644
--- a/src/frontend/src/pages/stock/StockDetail.tsx
+++ b/src/frontend/src/pages/stock/StockDetail.tsx
@@ -1066,6 +1066,7 @@ export default function StockDetail() {
               title={t`Stock Locations`}
               modelType={ModelType.stocklocation}
               endpoint={ApiEndpoints.stock_location_tree}
+              childIdentifier='sublocations'
               opened={treeOpen}
               onClose={() => setTreeOpen(false)}
               selectedId={stockitem?.location}