diff --git a/packages/builder/src/pages/[application]/frontend/[page]/[screen]/_layout.svelte b/packages/builder/src/pages/[application]/frontend/[page]/[screen]/_layout.svelte
index f35626a1f5..b9bed2866a 100644
--- a/packages/builder/src/pages/[application]/frontend/[page]/[screen]/_layout.svelte
+++ b/packages/builder/src/pages/[application]/frontend/[page]/[screen]/_layout.svelte
@@ -14,7 +14,9 @@
     if ($leftover) {
       // Get the correct screen children.
       const screenChildren = $store.pages[$params.page]._screens.find(
-        screen => screen.props._instanceName === $params.screen
+        screen => 
+          (screen.props._instanceName === $params.screen 
+          || screen.props._instanceName === decodeURIComponent($params.screen))
       ).props._children
       findComponent(componentIds, screenChildren)
     }