diff --git a/src/composables/deepLinkApi.ts b/src/composables/deepLinkApi.ts
index fbd25df98..a54f29b47 100644
--- a/src/composables/deepLinkApi.ts
+++ b/src/composables/deepLinkApi.ts
@@ -3,6 +3,8 @@ import {
   Router,
   RouteLocationNormalized as Route,
 } from 'vue-router';
+
+import { ROUTE_ACCOUNT } from '@/popup/router/routeNames';
 import { checkIfSuperheroCallbackUrl } from '@/utils';
 import { MODAL_TRANSFER_SEND } from '@/constants';
 import { useModals } from '@/composables/modals';
@@ -26,8 +28,11 @@ export function useDeepLinkApi({ router }: UseDeepLinkApiOptions) {
   /**
    * Function needed to support legacy tipping from superhero.com
    */
-  function checkIfOpenTransferSendModal() {
-    if (checkIfSuperheroCallbackUrl(route.query)) {
+  async function checkIfOpenTransferSendModal(currentRoute: Route) {
+    if (
+      currentRoute.path.slice(1) === ROUTE_ACCOUNT
+      && checkIfSuperheroCallbackUrl(currentRoute.query)
+    ) {
       const { openModal } = useModals();
 
       openModal(MODAL_TRANSFER_SEND);
diff --git a/src/popup/pages/Dashboard.vue b/src/popup/pages/Dashboard.vue
index 5be1028b3..695c3cfab 100644
--- a/src/popup/pages/Dashboard.vue
+++ b/src/popup/pages/Dashboard.vue
@@ -51,9 +51,9 @@
 <script lang="ts">
 import {
   defineComponent,
-  onMounted,
+  watch,
 } from 'vue';
-import { useRouter } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { useStore } from 'vuex';
 
 import {
@@ -97,6 +97,7 @@ export default defineComponent({
   },
   setup() {
     const store = useStore();
+    const route = useRoute();
     const router = useRouter();
 
     const {
@@ -107,9 +108,14 @@ export default defineComponent({
 
     const { isNodeMainnet, isNodeTestnet } = useAeSdk({ store });
 
-    onMounted(() => {
-      checkIfOpenTransferSendModal();
-    });
+    watch(
+      () => route.query,
+      () => checkIfOpenTransferSendModal(route),
+      {
+        deep: true,
+        immediate: true,
+      },
+    );
 
     return {
       PROTOCOL_AETERNITY,