diff --git a/src/app/components/Account/AccountLinkWithAddressSwitch.tsx b/src/app/components/Account/AccountLinkWithAddressSwitch.tsx
index 91c7ece86..48a90ee73 100644
--- a/src/app/components/Account/AccountLinkWithAddressSwitch.tsx
+++ b/src/app/components/Account/AccountLinkWithAddressSwitch.tsx
@@ -1,4 +1,17 @@
 import { AccountLink } from './AccountLink'
 import { withAddressSwitch } from './withAddressSwitch'
+import Box from '@mui/material/Box'
 
 export const AccountLinkWithAddressSwitch = withAddressSwitch(AccountLink)
+
+export const WrappedAccountLinkWithAddressSwitch: typeof AccountLinkWithAddressSwitch = props => (
+  <Box
+    sx={{
+      display: 'inline-flex',
+      maxWidth: '100%',
+      paddingRight: '0.5em',
+    }}
+  >
+    <AccountLinkWithAddressSwitch {...props} />
+  </Box>
+)
diff --git a/src/app/components/RuntimeEvents/RuntimeEventDetails.tsx b/src/app/components/RuntimeEvents/RuntimeEventDetails.tsx
index 7902cd131..a1337e0bc 100644
--- a/src/app/components/RuntimeEvents/RuntimeEventDetails.tsx
+++ b/src/app/components/RuntimeEvents/RuntimeEventDetails.tsx
@@ -24,7 +24,10 @@ import StreamIcon from '@mui/icons-material/Stream'
 import LocalFireDepartmentIcon from '@mui/icons-material/LocalFireDepartment'
 import { getPreciseNumberFormat } from '../../../locales/getPreciseNumberFormat'
 import { MaybeEventErrorLine } from './EventError'
-import { AccountLinkWithAddressSwitch } from '../Account/AccountLinkWithAddressSwitch'
+import {
+  AccountLinkWithAddressSwitch,
+  WrappedAccountLinkWithAddressSwitch,
+} from '../Account/AccountLinkWithAddressSwitch'
 import ArrowDownwardIcon from '@mui/icons-material/ArrowDownward'
 import ArrowForwardIcon from '@mui/icons-material/ArrowForward'
 import ArrowUpwardIcon from '@mui/icons-material/ArrowUpward'
@@ -207,7 +210,7 @@ export const RuntimeEventDetails: FC<{
             <br />
             {t('runtimeEvent.fields.emittingContract')}:
             <br />
-            <AccountLinkWithAddressSwitch
+            <WrappedAccountLinkWithAddressSwitch
               scope={scope}
               addressSwitchOption={addressSwitchOption}
               ethAddress={emittingEthAddress}
@@ -249,7 +252,7 @@ export const RuntimeEventDetails: FC<{
           <br />
           {t('runtimeEvent.fields.emittingContract')}:
           <br />
-          <AccountLinkWithAddressSwitch
+          <WrappedAccountLinkWithAddressSwitch
             scope={scope}
             addressSwitchOption={addressSwitchOption}
             ethAddress={emittingEthAddress}