diff --git a/core/templates/core/base.jinja b/core/templates/core/base.jinja
index a3afb49f..d4aa2637 100644
--- a/core/templates/core/base.jinja
+++ b/core/templates/core/base.jinja
@@ -124,20 +124,30 @@
     {% block script %}
       <script>
         const menuItems = document.querySelectorAll(".navbar details[name='navbar'].menu");
-        const isMobile = () => {
+        const isDesktop = () => {
           return window.innerWidth >= 500;
         }
         for (const item of menuItems){
           item.addEventListener("mouseover", () => {
-            if (isMobile()){
+            if (isDesktop()){
               item.setAttribute("open", "");
             }
           })
           item.addEventListener("mouseout", () => {
-            if (isMobile()){
+            if (isDesktop()){
               item.removeAttribute("open");
             }
           })
+          item.addEventListener("click", (event) => {
+            // Ignore keyboard clicks
+            if (event.detail === 0){
+              return;
+            }
+
+            if (isDesktop()){
+              event.preventDefault();
+            }
+          })
         }
 
         function showMenu() {