diff --git a/src/domain/navigation/index.js b/src/domain/navigation/index.js
index f443d415..dbac16ac 100644
--- a/src/domain/navigation/index.js
+++ b/src/domain/navigation/index.js
@@ -136,8 +136,7 @@ export function parseUrlPath(urlPath, currentNavPath, defaultSessionId) {
             const previousSegments = currentNavPath.segments;
             const i = previousSegments.findIndex(s => s.type === "right-panel");
             if (i !== -1) {
-                segments.push(previousSegments[i]);
-                segments.push(previousSegments[i + 1]);
+                segments.push(...previousSegments.slice(i));
             }
         } else if (type === "last-session") {
             let sessionSegment = currentNavPath.get("session");