diff --git a/packages/builder/src/components/backend/DataTable/DataTable.svelte b/packages/builder/src/components/backend/DataTable/DataTable.svelte
index 5ff7925c5f..436a3b4dee 100644
--- a/packages/builder/src/components/backend/DataTable/DataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/DataTable.svelte
@@ -44,6 +44,7 @@
   <CreateColumnButton />
   {#if schema && Object.keys(schema).length > 0}
     <CreateRowButton
+      title={isUsersTable ? 'Create New User' : 'Create New Row'}
       modalContentComponent={isUsersTable ? CreateEditUser : CreateEditRow} />
     <CreateViewButton />
     <ExportButton view={tableView} />
diff --git a/packages/builder/src/components/backend/DataTable/buttons/CreateRowButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/CreateRowButton.svelte
index dfd8e6f4ac..19975ac1a1 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/CreateRowButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/CreateRowButton.svelte
@@ -3,6 +3,7 @@
   import CreateEditRow from "../modals/CreateEditRow.svelte"
 
   export let modalContentComponent = CreateEditRow
+  export let title = "Create New Row"
 
   let modal
 </script>
@@ -10,7 +11,7 @@
 <div>
   <Button text small on:click={modal.show}>
     <Icon name="addrow" />
-    Create New Row
+    {title}
   </Button>
 </div>
 <Modal bind:this={modal}>
diff --git a/packages/builder/src/components/userInterface/ComponentNavigationTree/index.svelte b/packages/builder/src/components/userInterface/ComponentNavigationTree/index.svelte
index 8ccf8f7ac9..720b18f8f9 100644
--- a/packages/builder/src/components/userInterface/ComponentNavigationTree/index.svelte
+++ b/packages/builder/src/components/userInterface/ComponentNavigationTree/index.svelte
@@ -7,7 +7,7 @@
 
   $: {
     const allRoutes = $store.routes
-    const sortedPaths = Object.keys(allRoutes).sort()
+    const sortedPaths = Object.keys(allRoutes || {}).sort()
     const selectedRoleId = $selectedAccessRole
     const selectedScreenId = $store.selectedScreenId