diff --git a/packages/builder/src/components/design/NavigationPanel/NavigationPanel.svelte b/packages/builder/src/components/design/NavigationPanel/NavigationPanel.svelte
index ceca3452ad..cf2bb879a1 100644
--- a/packages/builder/src/components/design/NavigationPanel/NavigationPanel.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/NavigationPanel.svelte
@@ -12,8 +12,8 @@
       <Heading size="XS">{title || ""}</Heading>
     </div>
     {#if showAddButton}
-      <div class="add-button">
-        <Icon name="Add" on:click={onClickAddButton} />
+      <div class="add-button" on:click={onClickAddButton}>
+        <Icon name="Add" />
       </div>
     {/if}
   </div>
diff --git a/packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/NewScreenModal.svelte
similarity index 100%
rename from packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte
rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/NewScreenModal.svelte
diff --git a/packages/builder/src/components/design/NavigationPanel/ScreenWizard.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenWizard.svelte
similarity index 95%
rename from packages/builder/src/components/design/NavigationPanel/ScreenWizard.svelte
rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenWizard.svelte
index c30241868a..de88e00a03 100644
--- a/packages/builder/src/components/design/NavigationPanel/ScreenWizard.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenWizard.svelte
@@ -1,6 +1,6 @@
 <script>
-  import ScreenDetailsModal from "components/design/NavigationPanel/ScreenDetailsModal.svelte"
-  import NewScreenModal from "components/design/NavigationPanel/NewScreenModal.svelte"
+  import ScreenDetailsModal from "./ScreenDetailsModal.svelte"
+  import NewScreenModal from "./NewScreenModal.svelte"
   import sanitizeUrl from "builderStore/store/screenTemplates/utils/sanitizeUrl"
   import { Modal, notifications } from "@budibase/bbui"
   import { store, selectedAccessRole } from "builderStore"
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/index.svelte
index abd49b91e1..b40f246f5b 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/index.svelte
@@ -7,17 +7,22 @@
   import ScreenDropdownMenu from "./_components/ScreenDropdownMenu.svelte"
   import AppPanel from "components/design/AppPanel/AppPanel.svelte"
   import { RoleColours } from "constants"
+  import ScreenWizard from "./_components/ScreenWizard.svelte"
 
   let searchString
-  let accessRole
+  let accessRole = "all"
+  let showNewScreenModal
 
-  $: filteredScreens = getFilteredScreens($allScreens, searchString)
+  $: filteredScreens = getFilteredScreens($allScreens, searchString, accessRole)
 
-  const getFilteredScreens = (screens, searchString) => {
+  const getFilteredScreens = (screens, search, role) => {
     return screens
-      .filter(
-        screen => !searchString || screen.routing.route.includes(searchString)
-      )
+      .filter(screen => {
+        const searchMatch = !search || screen.routing.route.includes(search)
+        const roleMatch =
+          !role || role === "all" || screen.routing.roleId === role
+        return searchMatch && roleMatch
+      })
       .slice()
       .sort((a, b) => {
         return a.routing.route < b.routing.route ? -1 : 1
@@ -29,7 +34,11 @@
   }
 </script>
 
-<NavigationPanel title="Screens" showAddButton onClickAddButton>
+<NavigationPanel
+  title="Screens"
+  showAddButton
+  onClickAddButton={showNewScreenModal}
+>
   <Layout paddingX="L" paddingY="XL" gap="S">
     <Search
       placeholder="Enter a route to search"
@@ -38,10 +47,10 @@
     />
     <Select
       bind:value={accessRole}
-      placeholder="All screens"
+      placeholder={null}
       getOptionLabel={role => role.name}
       getOptionValue={role => role._id}
-      options={$roles}
+      options={[{ name: "All screens", _id: "all" }, ...$roles]}
     />
   </Layout>
   {#each filteredScreens as screen (screen._id)}
@@ -66,4 +75,6 @@
   {/each}
 </NavigationPanel>
 
+<ScreenWizard bind:showModal={showNewScreenModal} />
+
 <AppPanel />