diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte
index 5d9225420f..4a77795d3b 100644
--- a/packages/client/src/components/ClientApp.svelte
+++ b/packages/client/src/components/ClientApp.svelte
@@ -58,8 +58,22 @@
if ($authStore) {
// There is a logged in user, so handle them
if ($screenStore.screens.length) {
+ let firstRoute
+
+ // If using devtools, find the first screen matching our role
+ if ($devToolsStore.role) {
+ firstRoute =
+ $screenStore.screens.filter(
+ screen => screen.routing?.roleId === $devToolsStore.role
+ )[0]?.routing?.route || "/"
+ }
+
+ // Otherwise just use the fist route
+ else {
+ firstRoute = $screenStore.screens[0]?.routing?.route ?? "/"
+ }
+
// Screens exist so navigate back to the home screen
- const firstRoute = $screenStore.screens[0].routing?.route ?? "/"
routeStore.actions.navigate(firstRoute)
} else {
// No screens likely means the user has no permissions to view this app
diff --git a/packages/client/src/components/context/UserBindingsProvider.svelte b/packages/client/src/components/context/UserBindingsProvider.svelte
index e788d80dc4..f7605122ae 100644
--- a/packages/client/src/components/context/UserBindingsProvider.svelte
+++ b/packages/client/src/components/context/UserBindingsProvider.svelte
@@ -1,6 +1,6 @@
-
+
diff --git a/packages/client/src/components/devtools/DevTools.svelte b/packages/client/src/components/devtools/DevTools.svelte
index cf21f16503..4bb332da2f 100644
--- a/packages/client/src/components/devtools/DevTools.svelte
+++ b/packages/client/src/components/devtools/DevTools.svelte
@@ -41,7 +41,7 @@