diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/_components/ComponentListPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/_components/ComponentListPanel.svelte
index 170a50e44d..35c672e5ca 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/_components/ComponentListPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/_components/ComponentListPanel.svelte
@@ -134,7 +134,9 @@
     gap: var(--spacing-s);
     padding-top: 4px;
     transition: background 130ms ease-out;
-    line-height: 1.2;
+  }
+  .component :global(.spectrum-Body) {
+    line-height: 1.2 !important;
   }
   .component:hover {
     cursor: pointer;
diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/index.svelte
index 554ac89d94..3f66f1511d 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/components/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/components/index.svelte
@@ -1,12 +1,14 @@
 <script>
-  import { store } from "builderStore"
+  import { store, selectedScreen } from "builderStore"
   import { onMount } from "svelte"
   import { redirect } from "@roxi/routify"
 
   let loaded = false
 
   onMount(() => {
-    if ($store.screens?.length) {
+    if ($selectedScreen) {
+      $redirect(`./${$selectedScreen._id}`)
+    } else if ($store.screens?.length) {
       $redirect(`./${$store.screens[0]._id}`)
     } else {
       loaded = true
diff --git a/packages/builder/src/pages/builder/app/[application]/design/screens/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/screens/index.svelte
index 554ac89d94..3f66f1511d 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/screens/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/screens/index.svelte
@@ -1,12 +1,14 @@
 <script>
-  import { store } from "builderStore"
+  import { store, selectedScreen } from "builderStore"
   import { onMount } from "svelte"
   import { redirect } from "@roxi/routify"
 
   let loaded = false
 
   onMount(() => {
-    if ($store.screens?.length) {
+    if ($selectedScreen) {
+      $redirect(`./${$selectedScreen._id}`)
+    } else if ($store.screens?.length) {
       $redirect(`./${$store.screens[0]._id}`)
     } else {
       loaded = true