diff --git a/src/components/navigation/menu-language/menu-language.tsx b/src/components/navigation/menu-language/menu-language.tsx
index ed0386d3465febec4893f8625cdcde3d9d50a4fc..60d8c8f21f6d7fdc861324082f7b34a2b3bedec8 100644
--- a/src/components/navigation/menu-language/menu-language.tsx
+++ b/src/components/navigation/menu-language/menu-language.tsx
@@ -67,14 +67,10 @@ export class MenuLanguage {
       this.menuLanguageToggled.emit();
 
       let hyHeader = this.el.closest('.hy-site-header') as HTMLElement;
-      const headerHeight = `${
-        languageMenuSelector.offsetHeight +
-        hyHeader.offsetTop +
-        hyHeader.offsetHeight +
-        8 -
-        languageMenuSelector.offsetTop -
-        languageMenuSelector.offsetHeight
-      }px`;
+      let rectHeader = hyHeader.getBoundingClientRect();
+      let rectLangMenu = languageMenuSelector.getBoundingClientRect();
+
+      const headerHeight = `${languageMenuSelector.offsetHeight + rectHeader.bottom + 8 - rectLangMenu.bottom}px`;
       const languagePanel = languageMenuSelector.shadowRoot.querySelectorAll(
         `.menu--language__dropdown`
       )[0] as HTMLElement;
diff --git a/src/components/site-header/hy-desktop-menu-links/hy-desktop-menu-links.tsx b/src/components/site-header/hy-desktop-menu-links/hy-desktop-menu-links.tsx
index 03d02953e1a8193670aa1b8ab04d13be35ed65ad..dcd5d96df730f08629b63e478751ebba259e6832 100644
--- a/src/components/site-header/hy-desktop-menu-links/hy-desktop-menu-links.tsx
+++ b/src/components/site-header/hy-desktop-menu-links/hy-desktop-menu-links.tsx
@@ -199,6 +199,13 @@ export class HyDesktopMenuLinks {
     }
   }
 
+  @Listen('click', {target: 'window'})
+  handleWindowClick(event) {
+    this.handleDesktopMenuClose(event);
+
+    event.stopPropagation();
+  }
+
   handleDesktopMenuClose(event) {
     let fadeOut = true;
     this.closePanel(fadeOut);