diff --git a/test/e2e/tests/dapp-interactions.spec.js b/test/e2e/tests/dapp-interactions.spec.js
index 652f28c1e..0c74c663b 100644
--- a/test/e2e/tests/dapp-interactions.spec.js
+++ b/test/e2e/tests/dapp-interactions.spec.js
@@ -109,7 +109,7 @@ describe('Dapp interactions', function () {
         await driver.clickElement(
           '[data-testid ="account-options-menu-button"]',
         );
-        await driver.clickElement({ text: 'Connected sites', tag: 'span' });
+        await driver.clickElement({ text: 'Connected sites', tag: 'div' });
         const connectedDapp1 = await driver.isElementPresent({
           text: 'http://127.0.0.1:8080',
           tag: 'bdi',
diff --git a/test/e2e/tests/token-details.spec.js b/test/e2e/tests/token-details.spec.js
index cceed2153..6f5ed33c0 100644
--- a/test/e2e/tests/token-details.spec.js
+++ b/test/e2e/tests/token-details.spec.js
@@ -36,7 +36,7 @@ describe('Token Details', function () {
         await driver.clickElement({ text: 'Add custom token', tag: 'button' });
         await driver.clickElement({ text: 'Import tokens', tag: 'button' });
         await driver.clickElement('[aria-label="Asset options"]');
-        await driver.clickElement({ text: 'Token details', tag: 'span' });
+        await driver.clickElement({ text: 'Token details', tag: 'div' });
 
         const tokenAddressFound = {
           text: tokenAddress,
diff --git a/ui/components/ui/menu/menu-item.js b/ui/components/ui/menu/menu-item.js
index 08cfd20a2..c3c409cc4 100644
--- a/ui/components/ui/menu/menu-item.js
+++ b/ui/components/ui/menu/menu-item.js
@@ -20,8 +20,10 @@ const MenuItem = ({
     {iconName ? (
       <Icon name={iconName} size={ICON_SIZES.SM} marginRight={2} />
     ) : null}
-    <span>{children}</span>
-    {subtitle}
+    <div>
+      <div>{children}</div>
+      {subtitle ? <div>{subtitle}</div> : null}
+    </div>
   </button>
 );