diff --git a/frontend/src/metabase/components/EntityMenuItem.jsx b/frontend/src/metabase/components/EntityMenuItem.jsx
index b7fb65cea6920fb42bfcd00e69133adc9a211b53..d6836e11bbf828badd4f9639c337a860b76d75f6 100644
--- a/frontend/src/metabase/components/EntityMenuItem.jsx
+++ b/frontend/src/metabase/components/EntityMenuItem.jsx
@@ -1,62 +1,30 @@
 /* eslint-disable react/prop-types */
 import React from "react";
-import styled from "@emotion/styled";
 import { Link } from "react-router";
 
 import Icon from "metabase/components/Icon";
+import { Item, StyledExternalLink } from "./EntityMenuItem.styled";
 
-import { color } from "metabase/lib/colors";
-
-const Item = styled.div`
-  display: flex;
-  align-items: center;
-  cursor: pointer;
-  color: ${color("text-medium")};
-  padding: 0.85em 1.45em;
-  text-decoration: none;
-  transition: all 300ms linear;
-  :hover {
-    color: ${color("brand")};
-  }
-  > .Icon {
-    color: ${color("text-light")};
-    margin-right: 0.65em;
-  }
-  :hover > .Icon {
-    color: ${color("brand")};
-    transition: all 300ms linear;
-  },
-  /* icon specific tweaks
-     the alert icon should be optically aligned  with the x-height of the text */
-  > .Icon.Icon-alert {
-    transform: translate-y(1px),
-  }
-  /* the embed icon should be optically aligned with the x-height of the text */
-  > .Icon.Icon-embed {
-    transform: translate-y(1px);
-  }
-  /* the download icon should be optically aligned with the x-height of the text */
-  > .Icon.Icon-download: {
-    transform: translate-y(1px);
-  }
-  /* the history icon is wider so it needs adjustment to center it with other
-   icons */
-  "> .Icon.Icon-history": {
-    transform: translate-x(-2px);
-  },
-`;
-
-const LinkMenuItem = ({ children, link, onClose, event, externalLink }) => (
-  <Link
-    to={link}
-    target={externalLink ? "_blank" : null}
-    onClick={onClose}
-    data-metabase-event={event}
-    style={{ display: "block" }}
-  >
-    {children}
-  </Link>
-);
+const LinkMenuItem = ({ children, link, onClose, event, externalLink }) =>
+  externalLink ? (
+    <StyledExternalLink
+      href={link}
+      target="_blank"
+      onClick={onClose}
+      data-metabase-event={event}
+    >
+      {children}
+    </StyledExternalLink>
+  ) : (
+    <Link
+      to={link}
+      onClick={onClose}
+      data-metabase-event={event}
+      className="block"
+    >
+      {children}
+    </Link>
+  );
 
 const ActionMenuItem = ({ children, action, event }) => (
   <div onClick={action} data-metabase-event={event}>
diff --git a/frontend/src/metabase/components/EntityMenuItem.styled.jsx b/frontend/src/metabase/components/EntityMenuItem.styled.jsx
new file mode 100644
index 0000000000000000000000000000000000000000..33ca602e79a94fe9b62cd331839001adce3a5730
--- /dev/null
+++ b/frontend/src/metabase/components/EntityMenuItem.styled.jsx
@@ -0,0 +1,48 @@
+import styled from "@emotion/styled";
+
+import ExternalLink from "metabase/core/components/ExternalLink";
+import { color } from "metabase/lib/colors";
+
+export const Item = styled.div`
+  display: flex;
+align-items: center;
+  cursor: pointer;
+  color: ${color("text-medium")};
+  padding: 0.85em 1.45em;
+  text-decoration: none;
+  transition: all 300ms linear;
+  :hover {
+    color: ${color("brand")};
+  }
+  > .Icon {
+    color: ${color("text-light")};
+    margin-right: 0.65em;
+  }
+  :hover > .Icon {
+    color: ${color("brand")};
+    transition: all 300ms linear;
+  },
+  /* icon specific tweaks
+     the alert icon should be optically aligned  with the x-height of the text */
+  > .Icon.Icon-alert {
+    transform: translate-y(1px),
+}
+  /* the embed icon should be optically aligned with the x-height of the text */
+  > .Icon.Icon-embed {
+    transform: translate-y(1px);
+  }
+  /* the download icon should be optically aligned with the x-height of the text */
+  > .Icon.Icon-download: {
+    transform: translate-y(1px);
+  }
+  /* the history icon is wider so it needs adjustment to center it with other
+   icons */
+  "> .Icon.Icon-history": {
+    transform: translate-x(-2px);
+  },
+`;
+
+export const StyledExternalLink = styled(ExternalLink)`
+  text-decoration: none;
+  display: block;
+`;