diff --git a/packages/builder/src/builderStore/index.js b/packages/builder/src/builderStore/index.js
index 504f33861b..619bdd94a1 100644
--- a/packages/builder/src/builderStore/index.js
+++ b/packages/builder/src/builderStore/index.js
@@ -33,7 +33,7 @@ export const selectedComponentPath = derived(
   [store, currentAsset],
   ([$store, $currentAsset]) => {
     return findComponentPath(
-      $currentAsset.props,
+      $currentAsset?.props,
       $store.selectedComponentId
     ).map(component => component._id)
   }
diff --git a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/index.svelte b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/index.svelte
index 187a8da98e..1c108f164e 100644
--- a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/index.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/index.svelte
@@ -55,11 +55,10 @@
   }
 </script>
 
-<div class="root">
+<div class="root" class:has-screens={!!paths?.length}>
   {#each paths as path, idx (path)}
     <PathTree border={idx > 0} {path} route={routes[path]} />
   {/each}
-
   {#if !paths.length}
     <div class="empty">
       There aren't any screens configured with this access role.
@@ -68,7 +67,7 @@
 </div>
 
 <style>
-  .root {
+  .root.has-screens {
     min-width: max-content;
   }
   div.empty {