diff --git a/css/styles.css b/css/styles.css
index fb6b81497a66cc9a0509801eea9369270a8f58b5..b07c3ab78128ac0c4b6deca2f6dfb4a690856d94 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -6056,6 +6056,17 @@ fieldset,
             text-align: center;
             top: 0.5rem;
             transform: scale(0.75, 0.75) rotate(90deg); }
+        .no-scroll .uw-horizontal-nav.uw-horizontal-nav--header .uw-horizontal-nav--menu .menu--horizontal > .menu--item[aria-expanded="true"] > a {
+          border-left: inherit;
+          display: inline-block;
+          height: inherit;
+          overflow: inherit;
+          width: inherit;
+          z-index: 7; }
+          .no-scroll .uw-horizontal-nav.uw-horizontal-nav--header .uw-horizontal-nav--menu .menu--horizontal > .menu--item[aria-expanded="true"] > a span {
+            display: block; }
+          .no-scroll .uw-horizontal-nav.uw-horizontal-nav--header .uw-horizontal-nav--menu .menu--horizontal > .menu--item[aria-expanded="true"] > a::after {
+            transform: scale(0.75, 0.75) rotate(270deg); }
       .uw-horizontal-nav.uw-horizontal-nav--header .uw-horizontal-nav--menu .menu--subnav {
         display: none; }
       .uw-horizontal-nav.uw-horizontal-nav--header .uw-horizontal-nav--menu .menu .submenu-active .menu--subnav {
@@ -6072,8 +6083,12 @@ fieldset,
         width: auto; }
         .uw-horizontal-nav.uw-horizontal-nav--header .uw-horizontal-nav--menu .menu .submenu-active .menu--subnav .menu--item {
           max-width: inherit; }
-        .uw-horizontal-nav.uw-horizontal-nav--header .uw-horizontal-nav--menu .menu .submenu-active .menu--subnav li .menu--link-parent {
-          display: none !important; }
+          .uw-horizontal-nav.uw-horizontal-nav--header .uw-horizontal-nav--menu .menu .submenu-active .menu--subnav .menu--item__parent {
+            display: none; }
+          .no-scroll .uw-horizontal-nav.uw-horizontal-nav--header .uw-horizontal-nav--menu .menu .submenu-active .menu--subnav .menu--item a {
+            border-color: transparent; }
+            .no-scroll .uw-horizontal-nav.uw-horizontal-nav--header .uw-horizontal-nav--menu .menu .submenu-active .menu--subnav .menu--item a:hover {
+              border-color: #e6e6e6; }
         .uw-horizontal-nav.uw-horizontal-nav--header .uw-horizontal-nav--menu .menu .submenu-active .menu--subnav .menu--subnav {
           border: 0 solid #fff; }
 
diff --git a/js/component_scripts.min.js b/js/component_scripts.min.js
index eb2222dbe15f336463a88a9b3abd9776b7bbb64a..696a4a4cc803fd1c09a9fb0fd25b75e28d6c9e7e 100644
--- a/js/component_scripts.min.js
+++ b/js/component_scripts.min.js
@@ -1,20 +1,3 @@
-/**
- * @file
- * Ckeditor Modal.
- */
-
-(function ($, Drupal) {
-  if ($.ui && $.ui.dialog) {
-    orig_allowInteraction = $.ui.dialog.prototype._allowInteraction;
-    $.ui.dialog.prototype._allowInteraction = function (event) {
-      if ($(event.target).closest('.cke_dialog').length) {
-        return true;
-      }
-      return orig_allowInteraction.apply(this, arguments);
-    };
-  }
-})(jQuery, Drupal);
-
 /**
  * @file
  */
@@ -346,6 +329,23 @@ else {
   };
 })(jQuery);
 
+/**
+ * @file
+ * Ckeditor Modal.
+ */
+
+(function ($, Drupal) {
+  if ($.ui && $.ui.dialog) {
+    orig_allowInteraction = $.ui.dialog.prototype._allowInteraction;
+    $.ui.dialog.prototype._allowInteraction = function (event) {
+      if ($(event.target).closest('.cke_dialog').length) {
+        return true;
+      }
+      return orig_allowInteraction.apply(this, arguments);
+    };
+  }
+})(jQuery, Drupal);
+
 /**
  * @file
  */
diff --git a/source/_patterns/04-components/menu/menu--header/_menu--header.scss b/source/_patterns/04-components/menu/menu--header/_menu--header.scss
index a2715b7a6c1b03ae40f535903dde1b283e0421cd..20912e0bd78930b36ba454ebad8dac0b25d7c602 100644
--- a/source/_patterns/04-components/menu/menu--header/_menu--header.scss
+++ b/source/_patterns/04-components/menu/menu--header/_menu--header.scss
@@ -71,6 +71,25 @@ $menu-horizontal-drop-bg: #f7f7f7;
               }
             }
           }
+          .no-scroll & {
+            &[aria-expanded="true"]{
+              > a{
+                border-left:inherit;
+                display:inline-block;
+                height:inherit;
+                overflow:inherit;
+                width:inherit;
+                // Puts the content at z-index 7
+                z-index: gesso-z-index(dropdown);
+                span{
+                  display:block;
+                }
+                &::after {
+                  transform: scale(0.75, 0.75) rotate(270deg);
+                }
+              }
+            }
+          }
         }
       }
       &--subnav {
@@ -91,21 +110,22 @@ $menu-horizontal-drop-bg: #f7f7f7;
 
         .menu--item{
           max-width:inherit;
-        }
-        li{
-
-          .menu--link-parent{
-            display:none !important;
+          &__parent{
+            display:none;
+          }
+          a{
+            .no-scroll &{
+              border-color:transparent;
+              &:hover{
+                border-color:#e6e6e6;
+              }
+            }
           }
         }
         .menu--subnav{
           border:0 solid #fff;
         }
-        > li{
-        }
       }
-
     }
   }
-
 }