diff --git a/infrastructure/eid-wallet/src/routes/(app)/scan-qr/+page.svelte b/infrastructure/eid-wallet/src/routes/(app)/scan-qr/+page.svelte
index e4f24ddc..815e472d 100644
--- a/infrastructure/eid-wallet/src/routes/(app)/scan-qr/+page.svelte
+++ b/infrastructure/eid-wallet/src/routes/(app)/scan-qr/+page.svelte
@@ -51,14 +51,13 @@
     let signingSessionId = $state<string | null>(null);
     let signingData = $state<any>(null);
     let isSigningRequest = $state(false);
-    let signingSuccess = $state(false);
+    let showSigningSuccess = $state(false);
 
     // Blind voting specific state
     let isBlindVotingRequest = $state(false);
     let selectedBlindVoteOption = $state<number | null>(null);
     let blindVoteError = $state<string | null>(null); // Add error state
     let isSubmittingBlindVote = $state(false); // Add loading state
-    let blindVoteSuccess = $state(false); // Add success state
 
     // Reveal vote specific state
     let isRevealRequest = $state(false);
@@ -510,15 +509,18 @@
                 throw new Error("Failed to submit signed payload");
             }
 
-            // Close the signing drawer and show success
-            signingDrawerOpen = false;
-            signingSuccess = true;
+            // Stop the camera and show success state in the drawer
+            if (scanning) {
+                cancelScan();
+            }
+            showSigningSuccess = true;
 
             console.log(
                 signingData.pollId
                     ? "Vote signed successfully!"
                     : "Message signed successfully!",
             );
+
             // Check if this was from a deep link
             const deepLinkData = sessionStorage.getItem("deepLinkData");
             if (deepLinkData) {
@@ -526,11 +528,8 @@
                     const data = JSON.parse(deepLinkData);
                     if (data.type === "sign") {
                         console.log("Signing completed via deep link");
-                        // Show success message briefly, then continue
-                        setTimeout(() => {
-                            signingSuccess = false;
-                            startScan();
-                        }, 1500); // Give user time to see success message
+                        // For deep links, just continue scanning
+                        startScan();
                         return;
                     }
                 } catch (error) {
@@ -538,11 +537,7 @@
                 }
             }
 
-            // Not from deep link, continue scanning after a short delay
-            setTimeout(() => {
-                signingSuccess = false;
-                startScan();
-            }, 1500);
+            // Not from deep link, show success state (drawer will handle the redirect)
         } catch (error) {
             console.error("Error signing vote:", error);
         } finally {
@@ -879,34 +874,15 @@
             if (response.status >= 200 && response.status < 300) {
                 console.log("✅ Blind vote submitted successfully");
 
-                // Set success state for proper UI feedback
-                blindVoteSuccess = true;
-
                 // Reset states gradually to avoid white screen
                 blindVoteError = null;
                 isSubmittingBlindVote = false;
-                blindVoteSuccess = true; // Set success state
-
-                // Close the signing drawer
-                signingDrawerOpen = false;
-
-                // Reset blind voting specific states
-                isBlindVotingRequest = false;
-                selectedBlindVoteOption = null;
-                signingData = null;
-
-                // Ensure we're back to scanning mode
-                setTimeout(() => {
-                    // Reset all drawer states to ensure camera view is shown
-                    codeScannedDrawerOpen = false;
-                    loggedInDrawerOpen = false;
-                    signingDrawerOpen = false;
-                    signingSuccess = false;
-                    blindVoteSuccess = false; // Reset success state
-
-                    // Start scanning again
-                    startScan();
-                }, 100); // Small delay to ensure state transitions complete
+
+                // Stop the camera and show success state for blind voting
+                if (scanning) {
+                    cancelScan();
+                }
+                showSigningSuccess = true;
             } else {
                 console.error("❌ Failed to submit blind vote");
                 blindVoteError =
@@ -930,14 +906,37 @@
     }
 
     function closeDrawer() {
+        // Stop the camera if it's running
+        if (scanning) {
+            cancelScan();
+        }
+
         codeScannedDrawerOpen = false;
         loggedInDrawerOpen = false;
         signingDrawerOpen = false;
-        signingSuccess = false;
         isBlindVotingRequest = false;
         selectedBlindVoteOption = null;
         signingData = null;
         signingSessionId = null;
+        showSigningSuccess = false;
+    }
+
+    function handleSuccessOkay() {
+        // Stop the camera if it's running
+        if (scanning) {
+            cancelScan();
+        }
+
+        // Reset all states
+        showSigningSuccess = false;
+        signingDrawerOpen = false;
+        isBlindVotingRequest = false;
+        selectedBlindVoteOption = null;
+        signingData = null;
+        signingSessionId = null;
+
+        // Redirect to main page
+        goto("/main");
     }
 
     onMount(async () => {
@@ -971,6 +970,26 @@
             console.log("Redirect:", data.redirect);
             console.log("Redirect URI:", data.redirect_uri);
 
+            // Prevent duplicate processing by checking if we're already handling this type of request
+            if (data.type === "auth" && codeScannedDrawerOpen) {
+                console.log(
+                    "Auth request already in progress, ignoring duplicate",
+                );
+                return;
+            }
+            if (data.type === "sign" && signingDrawerOpen) {
+                console.log(
+                    "Signing request already in progress, ignoring duplicate",
+                );
+                return;
+            }
+            if (data.type === "reveal" && isRevealRequest) {
+                console.log(
+                    "Reveal request already in progress, ignoring duplicate",
+                );
+                return;
+            }
+
             if (data.type === "auth") {
                 console.log("Handling auth deep link");
                 // Handle auth deep link
@@ -1125,6 +1144,12 @@
         }
 
         // Listen for deep link events when already on the page
+        const handleDeepLinkReceived = async (event: CustomEvent) => {
+            console.log("Received deepLinkReceived event:", event.detail);
+            await handleDeepLinkData(event.detail);
+        };
+
+        // Also listen for the legacy events as backup
         const handleAuthEvent = async (event: CustomEvent) => {
             console.log("Received deepLinkAuth event:", event.detail);
             await handleDeepLinkData({
@@ -1141,6 +1166,13 @@
             });
         };
 
+        // Listen for the new global deep link event
+        window.addEventListener("deepLinkReceived", (event) => {
+            console.log("Scan page received deepLinkReceived event:", event);
+            handleDeepLinkReceived(event as CustomEvent);
+        });
+
+        // Listen for legacy deep link events
         window.addEventListener("deepLinkAuth", (event) =>
             handleAuthEvent(event as CustomEvent),
         );
@@ -1150,6 +1182,9 @@
 
         // Cleanup event listeners
         onDestroy(() => {
+            window.removeEventListener("deepLinkReceived", (event) =>
+                handleDeepLinkReceived(event as CustomEvent),
+            );
             window.removeEventListener("deepLinkAuth", (event) =>
                 handleAuthEvent(event as CustomEvent),
             );
@@ -1472,218 +1507,262 @@
 
 <!-- signing confirmation drawer -->
 <Drawer
-    title={isBlindVotingRequest
-        ? "Blind Vote"
-        : signingData?.pollId
-          ? "Sign Vote"
-          : "Sign Message"}
+    title={showSigningSuccess
+        ? "Success"
+        : isBlindVotingRequest
+          ? "Blind Vote"
+          : signingData?.pollId
+            ? "Sign Vote"
+            : "Sign Message"}
     bind:isPaneOpen={signingDrawerOpen}
     class="flex flex-col gap-4 items-center justify-center"
 >
-    <div
-        class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]"
-    >
+    {#if showSigningSuccess}
+        <!-- Success Content -->
         <div
-            class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"
-        ></div>
-        <div
-            class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"
-        ></div>
-        <HugeiconsIcon
-            size={40}
-            className="z-10"
-            icon={QrCodeIcon}
-            strokeWidth={1.5}
-            color="var(--color-primary)"
-        />
-    </div>
+            class="flex justify-center mb-4 relative items-center overflow-hidden bg-green-100 rounded-xl p-4 h-[72px] w-[72px]"
+        >
+            <div
+                class="bg-green-500 h-[16px] w-[200px] -rotate-45 absolute top-1"
+            ></div>
+            <div
+                class="bg-green-500 h-[16px] w-[200px] -rotate-45 absolute bottom-1"
+            ></div>
+            <HugeiconsIcon
+                size={40}
+                className="z-10"
+                icon={QrCodeIcon}
+                strokeWidth={1.5}
+                color="var(--color-success)"
+            />
+        </div>
 
-    <h4>
-        {isBlindVotingRequest
-            ? "Blind Vote Request"
-            : signingData?.pollId
-              ? "Sign Vote Request"
-              : "Sign Message Request"}
-    </h4>
-    <p class="text-black-700">
-        {isBlindVotingRequest
-            ? "You're being asked to submit a blind vote for the following poll"
-            : signingData?.pollId
-              ? "You're being asked to sign a vote for the following poll"
-              : "You're being asked to sign the following message"}
-    </p>
-
-    {#if signingData?.pollId && signingData?.voteData}
-        <!-- Poll Details -->
-        <div class="bg-gray rounded-2xl w-full p-4 mt-4">
-            <h4 class="text-base text-black-700">Poll ID</h4>
-            <p class="text-black-700 font-normal">
-                {signingData?.pollId ?? "Unknown"}
-            </p>
+        <h4 class="text-green-800">
+            {isBlindVotingRequest
+                ? "Blind Vote Submitted Successfully!"
+                : signingData?.pollId
+                  ? "Vote Signed Successfully!"
+                  : "Message Signed Successfully!"}
+        </h4>
+        <p class="text-black-700 text-center">
+            {isBlindVotingRequest
+                ? "Your blind vote has been submitted and is now completely hidden using cryptographic commitments."
+                : signingData?.pollId
+                  ? "Your vote has been signed and submitted to the voting system."
+                  : "Your message has been signed and submitted successfully."}
+        </p>
+
+        <div class="flex justify-center mt-6 w-full">
+            <Button.Action
+                variant="solid"
+                class="w-full"
+                callback={handleSuccessOkay}
+            >
+                Okay
+            </Button.Action>
         </div>
-    {:else if isBlindVotingRequest && signingData?.pollDetails}
-        <!-- Blind Voting UI -->
-        <div class="blind-voting-section">
-            <h3 class="text-lg font-semibold mb-4">Blind Voting</h3>
-
-            <!-- Error Display -->
-            {#if blindVoteError}
-                <div
-                    class="bg-red-50 border border-red-200 rounded-lg p-4 mb-4"
-                >
-                    <div class="flex items-center">
-                        <div class="flex-shrink-0">
-                            <svg
-                                class="h-5 w-5 text-red-400"
-                                viewBox="0 0 20 20"
-                                fill="currentColor"
-                            >
-                                <path
-                                    fill-rule="evenodd"
-                                    d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z"
-                                    clip-rule="evenodd"
-                                />
-                            </svg>
-                        </div>
-                        <div class="ml-3">
-                            <h3 class="text-sm font-medium text-red-800">
-                                Error
-                            </h3>
-                            <div class="mt-2 text-sm text-red-700">
-                                {blindVoteError}
+    {:else}
+        <!-- Regular Signing Content -->
+        <div
+            class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]"
+        >
+            <div
+                class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"
+            ></div>
+            <div
+                class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"
+            ></div>
+            <HugeiconsIcon
+                size={40}
+                className="z-10"
+                icon={QrCodeIcon}
+                strokeWidth={1.5}
+                color="var(--color-primary)"
+            />
+        </div>
+
+        <h4>
+            {isBlindVotingRequest
+                ? "Blind Vote Request"
+                : signingData?.pollId
+                  ? "Sign Vote Request"
+                  : "Sign Message Request"}
+        </h4>
+        <p class="text-black-700">
+            {isBlindVotingRequest
+                ? "You're being asked to submit a blind vote for the following poll"
+                : signingData?.pollId
+                  ? "You're being asked to sign a vote for the following poll"
+                  : "You're being asked to sign the following message"}
+        </p>
+
+        {#if signingData?.pollId && signingData?.voteData}
+            <!-- Poll Details -->
+            <div class="bg-gray rounded-2xl w-full p-4 mt-4">
+                <h4 class="text-base text-black-700">Poll ID</h4>
+                <p class="text-black-700 font-normal">
+                    {signingData?.pollId ?? "Unknown"}
+                </p>
+            </div>
+        {:else if isBlindVotingRequest && signingData?.pollDetails}
+            <!-- Blind Voting UI -->
+            <div class="blind-voting-section">
+                <h3 class="text-lg font-semibold mb-4">Blind Voting</h3>
+
+                <!-- Error Display -->
+                {#if blindVoteError}
+                    <div
+                        class="bg-red-50 border border-red-200 rounded-lg p-4 mb-4"
+                    >
+                        <div class="flex items-center">
+                            <div class="flex-shrink-0">
+                                <svg
+                                    class="h-5 w-5 text-red-400"
+                                    viewBox="0 0 20 20"
+                                    fill="currentColor"
+                                >
+                                    <path
+                                        fill-rule="evenodd"
+                                        d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z"
+                                        clip-rule="evenodd"
+                                    />
+                                </svg>
+                            </div>
+                            <div class="ml-3">
+                                <h3 class="text-sm font-medium text-red-800">
+                                    Error
+                                </h3>
+                                <div class="mt-2 text-sm text-red-700">
+                                    {blindVoteError}
+                                </div>
                             </div>
                         </div>
                     </div>
+                {/if}
+
+                <!-- Poll Details -->
+                <div class="bg-gray-50 rounded-lg p-4 mb-4">
+                    <h4 class="font-medium text-gray-900 mb-2">
+                        Poll: {signingData.pollDetails?.title || "Unknown"}
+                    </h4>
+                    <p class="text-sm text-gray-600">
+                        Creator: {signingData.pollDetails?.creatorName ||
+                            "Unknown"}
+                    </p>
                 </div>
-            {/if}
 
-            <!-- Poll Details -->
-            <div class="bg-gray-50 rounded-lg p-4 mb-4">
-                <h4 class="font-medium text-gray-900 mb-2">
-                    Poll: {signingData.pollDetails?.title || "Unknown"}
-                </h4>
-                <p class="text-sm text-gray-600">
-                    Creator: {signingData.pollDetails?.creatorName || "Unknown"}
-                </p>
-            </div>
+                <!-- Vote Options -->
+                <div class="mb-4">
+                    <label class="block text-sm font-medium text-gray-700 mb-2"
+                        >Select your vote:</label
+                    >
+                    {#each signingData.pollDetails?.options || [] as option, index}
+                        <label class="flex items-center mb-2">
+                            <input
+                                type="radio"
+                                name="blindVoteOption"
+                                value={index}
+                                bind:group={selectedBlindVoteOption}
+                                on:change={() => {
+                                    console.log(
+                                        `🔍 Radio changed: index = ${index}, value = ${index}, selectedBlindVoteOption = ${selectedBlindVoteOption}`,
+                                    );
+                                    // Force the value to be a number
+                                    selectedBlindVoteOption = Number(index);
+                                }}
+                                class="mr-2"
+                            />
+                            <span class="text-sm">{option}</span>
+                        </label>
+                    {/each}
+                </div>
 
-            <!-- Vote Options -->
-            <div class="mb-4">
-                <label class="block text-sm font-medium text-gray-700 mb-2"
-                    >Select your vote:</label
+                <!-- Submit Button -->
+                <button
+                    on:click={() => {
+                        console.log(
+                            `🔍 Submit button clicked. selectedBlindVoteOption = ${selectedBlindVoteOption}, type = ${typeof selectedBlindVoteOption}`,
+                        );
+                        handleBlindVote();
+                    }}
+                    disabled={selectedBlindVoteOption === null ||
+                        isSubmittingBlindVote}
+                    class="w-full bg-blue-600 text-white py-2 px-4 rounded-lg hover:bg-blue-700 disabled:bg-gray-400 disabled:cursor-not-allowed"
                 >
-                {#each signingData.pollDetails?.options || [] as option, index}
-                    <label class="flex items-center mb-2">
-                        <input
-                            type="radio"
-                            name="blindVoteOption"
-                            value={index}
-                            bind:group={selectedBlindVoteOption}
-                            on:change={() => {
-                                console.log(
-                                    `🔍 Radio changed: index = ${index}, value = ${index}, selectedBlindVoteOption = ${selectedBlindVoteOption}`,
-                                );
-                                // Force the value to be a number
-                                selectedBlindVoteOption = Number(index);
-                            }}
-                            class="mr-2"
-                        />
-                        <span class="text-sm">{option}</span>
-                    </label>
-                {/each}
+                    {#if isSubmittingBlindVote}
+                        <span class="flex items-center justify-center">
+                            <svg
+                                class="animate-spin -ml-1 mr-3 h-5 w-5 text-white"
+                                xmlns="http://www.w3.org/2000/svg"
+                                fill="none"
+                                viewBox="0 0 24 24"
+                            >
+                                <circle
+                                    class="opacity-25"
+                                    cx="12"
+                                    cy="12"
+                                    r="10"
+                                    stroke="currentColor"
+                                    stroke-width="4"
+                                ></circle>
+                                <path
+                                    class="opacity-75"
+                                    fill="currentColor"
+                                    d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
+                                ></path>
+                            </svg>
+                            Submitting...
+                        </span>
+                    {:else}
+                        Submit Blind Vote
+                    {/if}
+                </button>
+            </div>
+        {:else}
+            <!-- Generic Message Details -->
+            <div class="bg-gray rounded-2xl w-full p-4 mt-4">
+                <h4 class="text-base text-black-700">Message</h4>
+                <p class="text-black-700 font-normal">
+                    {signingData?.message ?? "No message provided"}
+                </p>
             </div>
 
-            <!-- Submit Button -->
-            <button
-                on:click={() => {
-                    console.log(
-                        `🔍 Submit button clicked. selectedBlindVoteOption = ${selectedBlindVoteOption}, type = ${typeof selectedBlindVoteOption}`,
-                    );
-                    handleBlindVote();
-                }}
-                disabled={selectedBlindVoteOption === null ||
-                    isSubmittingBlindVote}
-                class="w-full bg-blue-600 text-white py-2 px-4 rounded-lg hover:bg-blue-700 disabled:bg-gray-400 disabled:cursor-not-allowed"
-            >
-                {#if isSubmittingBlindVote}
-                    <span class="flex items-center justify-center">
-                        <svg
-                            class="animate-spin -ml-1 mr-3 h-5 w-5 text-white"
-                            xmlns="http://www.w3.org/2000/svg"
-                            fill="none"
-                            viewBox="0 0 24 24"
-                        >
-                            <circle
-                                class="opacity-25"
-                                cx="12"
-                                cy="12"
-                                r="10"
-                                stroke="currentColor"
-                                stroke-width="4"
-                            ></circle>
-                            <path
-                                class="opacity-75"
-                                fill="currentColor"
-                                d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
-                            ></path>
-                        </svg>
-                        Submitting...
-                    </span>
-                {:else}
-                    Submit Blind Vote
-                {/if}
-            </button>
-        </div>
-    {:else}
-        <!-- Generic Message Details -->
-        <div class="bg-gray rounded-2xl w-full p-4 mt-4">
-            <h4 class="text-base text-black-700">Message</h4>
-            <p class="text-black-700 font-normal">
-                {signingData?.message ?? "No message provided"}
-            </p>
-        </div>
+            <div class="bg-gray rounded-2xl w-full p-4">
+                <h4 class="text-base text-black-700">Session ID</h4>
+                <p class="text-black-700 font-normal font-mono">
+                    {signingData?.sessionId?.slice(0, 8) ?? "Unknown"}...
+                </p>
+            </div>
+        {/if}
 
-        <div class="bg-gray rounded-2xl w-full p-4">
-            <h4 class="text-base text-black-700">Session ID</h4>
-            <p class="text-black-700 font-normal font-mono">
-                {signingData?.sessionId?.slice(0, 8) ?? "Unknown"}...
-            </p>
+        <div class="flex justify-center gap-3 items-center mt-4">
+            {#if !isBlindVotingRequest}
+                <Button.Action
+                    variant="danger-soft"
+                    class="w-full"
+                    callback={() => {
+                        signingDrawerOpen = false;
+                        startScan();
+                    }}
+                >
+                    Decline
+                </Button.Action>
+            {/if}
+            {#if !isBlindVotingRequest}
+                <Button.Action
+                    variant="solid"
+                    class="w-full"
+                    callback={handleSignVote}
+                >
+                    {loading
+                        ? "Signing..."
+                        : signingData?.pollId
+                          ? "Sign Vote"
+                          : "Sign Message"}
+                </Button.Action>
+            {/if}
         </div>
     {/if}
-
-    <div class="flex justify-center gap-3 items-center mt-4">
-        {#if !isBlindVotingRequest}
-            <Button.Action
-                variant="danger-soft"
-                class="w-full"
-                callback={() => {
-                    signingDrawerOpen = false;
-                    startScan();
-                }}
-            >
-                Decline
-            </Button.Action>
-        {/if}
-        {#if !isBlindVotingRequest}
-            <Button.Action
-                variant="solid"
-                class="w-full"
-                callback={handleSignVote}
-            >
-                {loading
-                    ? "Signing..."
-                    : signingData?.pollId
-                      ? "Sign Vote"
-                      : "Sign Message"}
-            </Button.Action>
-        {/if}
-    </div>
-
-    <div class="text-center mt-3">
-        <p class="text-sm text-gray-600">
-            After signing, you'll be redirected back to the platform
-        </p>
-    </div>
 </Drawer>
 
 <!-- Reveal Vote Drawer -->
@@ -1784,55 +1863,3 @@
 </Drawer>
 
 <!-- Success message -->
-{#if signingSuccess}
-    <div
-        class="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50"
-    >
-        <div class="bg-white rounded-lg p-6 max-w-sm mx-4 text-center">
-            <div
-                class="w-16 h-16 bg-green-100 rounded-full flex items-center justify-center mx-auto mb-4"
-            >
-                <HugeiconsIcon
-                    size={32}
-                    icon={QrCodeIcon}
-                    color="var(--color-success)"
-                />
-            </div>
-            <h3 class="text-lg font-semibold text-gray-900 mb-2">
-                {isBlindVotingRequest
-                    ? "Blind Vote Submitted Successfully!"
-                    : signingData?.pollId
-                      ? "Vote Signed Successfully!"
-                      : "Message Signed Successfully!"}
-            </h3>
-            <p class="text-gray-600">
-                {isBlindVotingRequest
-                    ? "Your blind vote has been submitted and is now completely hidden using cryptographic commitments."
-                    : signingData?.pollId
-                      ? "Your vote has been signed and submitted to the voting system."
-                      : "Your message has been signed and submitted successfully."}
-            </p>
-
-            {#if redirect}
-                <div class="mt-4">
-                    <Button.Action
-                        variant="solid"
-                        size="sm"
-                        callback={() => {
-                            try {
-                                if (redirect) {
-                                    window.location.href = redirect;
-                                }
-                            } catch (error) {
-                                console.error("Manual redirect failed:", error);
-                            }
-                        }}
-                        class="w-full"
-                    >
-                        Return to Platform Now
-                    </Button.Action>
-                </div>
-            {/if}
-        </div>
-    </div>
-{/if}
diff --git a/infrastructure/eid-wallet/src/routes/+layout.svelte b/infrastructure/eid-wallet/src/routes/+layout.svelte
index f60c1526..071b3c43 100644
--- a/infrastructure/eid-wallet/src/routes/+layout.svelte
+++ b/infrastructure/eid-wallet/src/routes/+layout.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import SplashScreen from "$lib/fragments/SplashScreen/SplashScreen.svelte";
-    import { onMount, setContext, getContext } from "svelte";
+    import { onMount, setContext, getContext, onDestroy } from "svelte";
     import "../app.css";
     import { onNavigate, goto } from "$app/navigation";
     import { GlobalState } from "$lib/global/state";
@@ -15,6 +15,7 @@
     let showSplashScreen = $state(false);
     let previousRoute = null;
     let navigationStack: string[] = [];
+    let globalDeepLinkHandler: ((event: Event) => void) | undefined;
 
     setContext("globalState", () => globalState);
 
@@ -63,6 +64,40 @@
                     handleDeepLink(urls[0]);
                 }
             });
+
+            // Set up global event listener for deep links that arrive when app is already open
+            // This ensures deep links work even if the scan-qr page isn't mounted yet
+            globalDeepLinkHandler = (event: Event) => {
+                const customEvent = event as CustomEvent;
+                console.log(
+                    "Global deep link event received:",
+                    customEvent.detail,
+                );
+
+                // Check if we're already on the scan page
+                if (window.location.pathname === "/scan-qr") {
+                    // We're already on the scan page, dispatch the event directly
+                    console.log(
+                        "Already on scan page, dispatching event directly",
+                    );
+                    const directEvent = new CustomEvent("deepLinkReceived", {
+                        detail: customEvent.detail,
+                    });
+                    window.dispatchEvent(directEvent);
+                } else {
+                    // Store the deep link data and navigate to scan page
+                    console.log(
+                        "Not on scan page, storing data and navigating",
+                    );
+                    sessionStorage.setItem(
+                        "deepLinkData",
+                        JSON.stringify(customEvent.detail),
+                    );
+                    goto("/scan-qr");
+                }
+            };
+
+            window.addEventListener("deepLinkReceived", globalDeepLinkHandler);
         } catch (error) {
             console.error("Failed to initialize deep link listener:", error);
         }
@@ -135,14 +170,26 @@
                                     const vault =
                                         await globalState.vaultController.vault;
                                     if (vault) {
-                                        // User is authenticated, go to scan page
+                                        // User is authenticated, dispatch event and navigate to scan page
                                         console.log(
-                                            "User authenticated, navigating to scan-qr",
+                                            "User authenticated, dispatching deep link event and navigating to scan-qr",
+                                        );
+
+                                        // Dispatch a custom event that the scan page can listen to
+                                        const deepLinkEvent = new CustomEvent(
+                                            "deepLinkReceived",
+                                            {
+                                                detail: deepLinkData,
+                                            },
                                         );
+                                        window.dispatchEvent(deepLinkEvent);
+
+                                        // Also store in sessionStorage as backup
                                         sessionStorage.setItem(
                                             "deepLinkData",
                                             JSON.stringify(deepLinkData),
                                         );
+
                                         goto("/scan-qr");
                                         return;
                                     }
@@ -204,14 +251,26 @@
                                     const vault =
                                         await globalState.vaultController.vault;
                                     if (vault) {
-                                        // User is authenticated, go to scan page
+                                        // User is authenticated, dispatch event and navigate to scan page
                                         console.log(
-                                            "User authenticated, navigating to scan-qr",
+                                            "User authenticated, dispatching deep link event and navigating to scan-qr",
+                                        );
+
+                                        // Dispatch a custom event that the scan page can listen to
+                                        const deepLinkEvent = new CustomEvent(
+                                            "deepLinkReceived",
+                                            {
+                                                detail: deepLinkData,
+                                            },
                                         );
+                                        window.dispatchEvent(deepLinkEvent);
+
+                                        // Also store in sessionStorage as backup
                                         sessionStorage.setItem(
                                             "deepLinkData",
                                             JSON.stringify(deepLinkData),
                                         );
+
                                         goto("/scan-qr");
                                         return;
                                     }
@@ -262,14 +321,26 @@
                                     const vault =
                                         await globalState.vaultController.vault;
                                     if (vault) {
-                                        // User is authenticated, go to scan page
+                                        // User is authenticated, dispatch event and navigate to scan page
                                         console.log(
-                                            "User authenticated, navigating to scan-qr for reveal",
+                                            "User authenticated, dispatching deep link event and navigating to scan-qr for reveal",
+                                        );
+
+                                        // Dispatch a custom event that the scan page can listen to
+                                        const deepLinkEvent = new CustomEvent(
+                                            "deepLinkReceived",
+                                            {
+                                                detail: deepLinkData,
+                                            },
                                         );
+                                        window.dispatchEvent(deepLinkEvent);
+
+                                        // Also store in sessionStorage as backup
                                         sessionStorage.setItem(
                                             "deepLinkData",
                                             JSON.stringify(deepLinkData),
                                         );
+
                                         goto("/scan-qr");
                                         return;
                                     }
@@ -311,6 +382,16 @@
         showSplashScreen = false;
     });
 
+    // Cleanup global event listeners
+    onDestroy(() => {
+        if (typeof globalDeepLinkHandler !== "undefined") {
+            window.removeEventListener(
+                "deepLinkReceived",
+                globalDeepLinkHandler,
+            );
+        }
+    });
+
     const safeAreaTop = $derived.by(
         () =>
             Number.parseFloat(