diff --git a/packages/bridge-ui/src/components/TokenDropdown/TokenDropdown.svelte b/packages/bridge-ui/src/components/TokenDropdown/TokenDropdown.svelte
index f20dac2776..07ddc5a786 100644
--- a/packages/bridge-ui/src/components/TokenDropdown/TokenDropdown.svelte
+++ b/packages/bridge-ui/src/components/TokenDropdown/TokenDropdown.svelte
@@ -52,8 +52,7 @@
     menuOpen = false;
   };
 
-  const openMenu = (event: Event) => {
-    event.stopPropagation();
+  const openMenu = () => {
     menuOpen = true;
   };
 
@@ -201,7 +200,7 @@
     aria-expanded={menuOpen}
     class="f-between-center w-full h-full px-[20px] py-[14px] input-box bg-neutral-background border-0 shadow-none outline-none
     {combined ? '!rounded-l-[0px] !rounded-r-[10px]' : '!rounded-[10px]'}"
-    on:click={openMenu}>
+    on:click|stopPropagation={openMenu}>
     <div class="space-x-2">
       {#if !value || disabled}
         <span class="title-subsection-bold text-base text-secondary-content">{$t('token_dropdown.label')}</span>
diff --git a/packages/bridge-ui/src/components/Tooltip/Tooltip.svelte b/packages/bridge-ui/src/components/Tooltip/Tooltip.svelte
index 241120ba93..644ce3e0a7 100644
--- a/packages/bridge-ui/src/components/Tooltip/Tooltip.svelte
+++ b/packages/bridge-ui/src/components/Tooltip/Tooltip.svelte
@@ -23,8 +23,7 @@
     }, ms);
   }
 
-  function openTooltip(event: Event) {
-    event.stopPropagation();
+  function openTooltip() {
     tooltipOpen = true;
   }
 
@@ -45,8 +44,8 @@
     aria-haspopup="dialog"
     aria-controls={tooltipId}
     aria-expanded={tooltipOpen}
-    on:click={openTooltip}
-    on:focus={openTooltip}
+    on:click|stopPropagation={openTooltip}
+    on:focus|stopPropagation={openTooltip}
     on:mouseenter={openTooltip}
     bind:this={triggerElem}>
     <Icon type="question-circle" />
diff --git a/packages/bridge-ui/src/components/Transactions/MobileDetailsDialog.svelte b/packages/bridge-ui/src/components/Transactions/MobileDetailsDialog.svelte
index 74eaafa5ed..267191bd8b 100644
--- a/packages/bridge-ui/src/components/Transactions/MobileDetailsDialog.svelte
+++ b/packages/bridge-ui/src/components/Transactions/MobileDetailsDialog.svelte
@@ -31,8 +31,7 @@
   let openStatusDialog = false;
 
   let tooltipOpen = false;
-  const openToolTip = (event: Event) => {
-    event.stopPropagation();
+  const openToolTip = () => {
     tooltipOpen = !tooltipOpen;
   };
   let dialogId = `dialog-${uid()}`;
@@ -119,7 +118,7 @@
           <li class="f-between-center">
             <h4 class="text-secondary-content">
               <div class="f-items-center space-x-1">
-                <button on:click={openToolTip}>
+                <button on:click|stopPropagation={openToolTip}>
                   <span>{$t('transactions.header.status')}</span>
                 </button>
                 <button on:click={handleStatusDialog} class="flex justify-start content-center">
diff --git a/packages/bridge-ui/src/components/Transactions/Status/StatusInfoDialog.svelte b/packages/bridge-ui/src/components/Transactions/Status/StatusInfoDialog.svelte
index 582da5f7d3..3dc7f7245b 100644
--- a/packages/bridge-ui/src/components/Transactions/Status/StatusInfoDialog.svelte
+++ b/packages/bridge-ui/src/components/Transactions/Status/StatusInfoDialog.svelte
@@ -70,9 +70,8 @@
       <h4 class={classes.headline}>{$t('transactions.status.failed.name')}</h4>
       {$t('transactions.status.failed.description')}
     </div>
-
-    <!-- We catch key events aboe -->
-    <!-- svelte-ignore a11y-click-events-have-key-events -->
-    <div role="button" tabindex="0" class="overlay-backdrop" on:click={closeModalIfClickedOutside} />
   </div>
+  <!-- We catch key events aboe -->
+  <!-- svelte-ignore a11y-click-events-have-key-events -->
+  <div role="button" tabindex="0" class="overlay-backdrop" on:click={closeModalIfClickedOutside} />
 </dialog>