diff --git a/less/components/menu.less b/less/layout/_navbar.less
similarity index 89%
rename from less/components/menu.less
rename to less/layout/_navbar.less
index 1203fc93aa..61f67f245b 100644
--- a/less/components/menu.less
+++ b/less/layout/_navbar.less
@@ -1,3 +1,17 @@
+/*!
+ * Copyright (c) 2019, 2023 Eclipse Foundation, Inc.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * Contributors:
+ *   Eric Poirier <eric.poirier@eclipse-foundation.org>
+ *   Olivier Goulet <olivier.goulet@eclipse-foundation.org>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+*/
+
 .toolbar-container-wrapper{
     background-size: cover;
 }
@@ -213,6 +227,18 @@
     }
 }
 
+// Prevent menu from overflowing on the right side of the screen. The reason we
+// are selecting the 2nd last child is because the last child is a mobile-only
+// menu item. 
+#main-menu .navbar-nav li.dropdown:nth-last-child(2) { 
+  position: relative;
+
+  & > .dropdown-menu {
+    left: -100%;
+    right: auto;
+  }
+}
+
 .gsc-search-button-v2 {
     border: 1px solid @white !important;
     border-radius: 0px !important;
@@ -230,4 +256,5 @@
     line-height: 14px !important;
     position: relative;
     top: 3px;
-}
\ No newline at end of file
+}
+
diff --git a/less/styles.less b/less/styles.less
index 4545b6dbeb..1e443b0b32 100644
--- a/less/styles.less
+++ b/less/styles.less
@@ -1,5 +1,5 @@
 /*!
- * Copyright (c) 2019 Eclipse Foundation, Inc.
+ * Copyright (c) 2019, 2023 Eclipse Foundation, Inc.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -16,9 +16,9 @@
 
 @import 'vendors/_syntax.less';
 @import '_variables.less';
+
 @import 'components/tabs.less';
 @import 'components/_commons.less';
-@import 'components/menu.less';
 @import 'components/jumbotron.less';
 @import 'components/home.less';
 @import 'components/panels.less';
@@ -29,6 +29,7 @@
 @import 'components/_eclipsefdn-meeting-minutes.less';
 
 @import 'layout/_header.less';
+@import 'layout/_navbar.less';
 
 @import 'transient.less';
 @import 'release-8.less';