diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/index.js b/packages/docusaurus-theme-classic/src/theme/Navbar/index.js
index 16328e117876..4cba85a45b3c 100644
--- a/packages/docusaurus-theme-classic/src/theme/Navbar/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/Navbar/index.js
@@ -64,11 +64,9 @@ function NavItem({items, position, ...props}) {
       </NavLink>
       <ul className="dropdown__menu">
         {items.map((linkItemInner, i) => (
-          <NavLink
-            className="navbar__item navbar__link"
-            {...linkItemInner}
-            key={i}
-          />
+          <li key={i}>
+            <NavLink className="navbar__item navbar__link" {...linkItemInner} />
+          </li>
         ))}
       </ul>
     </div>
@@ -91,8 +89,8 @@ function MobileNavItem({items, ...props}) {
       </NavLink>
       <ul className="menu__list">
         {items.map((linkItemInner, i) => (
-          <li className="menu__list-item">
-            <NavLink className="menu__link" {...linkItemInner} key={i} />
+          <li className="menu__list-item" key={i}>
+            <NavLink className="menu__link" {...linkItemInner} />
           </li>
         ))}
       </ul>
diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
index 3cae3bf933a9..bd0a926279d2 100644
--- a/website/docusaurus.config.js
+++ b/website/docusaurus.config.js
@@ -92,12 +92,13 @@ module.exports = {
       links: [
         {
           label: 'Docs',
+          to: 'docs/introduction', // "fake" link
           position: 'left',
           activeBasePath: 'docs',
           items: [
             {
               label: versions[0],
-              to: `docs/introduction`,
+              to: 'docs/introduction',
             },
           ].concat(
             versions.slice(1).map(version => ({
diff --git a/website/src/css/custom.css b/website/src/css/custom.css
index 5e6ea0d649b1..b45ea0a3a234 100644
--- a/website/src/css/custom.css
+++ b/website/src/css/custom.css
@@ -30,3 +30,8 @@ html[data-theme='dark'] {
 html[data-theme='dark'] .docusaurus-highlight-code-line {
   background-color: rgb(0, 0, 0, 0.3);
 }
+
+/* This will be removed after new release of Infima */
+.navbar__item.dropdown > .navbar__link {
+  pointer-events: none;
+}