diff --git a/gbajs3/src/components/navigation-menu/navigation-menu.tsx b/gbajs3/src/components/navigation-menu/navigation-menu.tsx
index 7c64bef8..9fc3260e 100644
--- a/gbajs3/src/components/navigation-menu/navigation-menu.tsx
+++ b/gbajs3/src/components/navigation-menu/navigation-menu.tsx
@@ -58,6 +58,8 @@ type ExpandableComponentProps = {
 };
 
 const NavigationMenuWrapper = styled.div<ExpandableComponentProps>`
+  display: flex;
+  flex-direction: column;
   width: ${NavigationMenuWidth}px;
   height: 100dvh;
   position: fixed;
@@ -65,7 +67,6 @@ const NavigationMenuWrapper = styled.div<ExpandableComponentProps>`
   transition: 0.4s ease-in-out;
   -webkit-transition: 0.4s ease-in-out;
   z-index: 150;
-  overflow-y: auto;
   text-align: left;
   left: 0;
   top: 0;
@@ -74,11 +75,7 @@ const NavigationMenuWrapper = styled.div<ExpandableComponentProps>`
   ${({ $isExpanded = false }) =>
     !$isExpanded &&
     `left: -${NavigationMenuWidth + 5}px;
-    `}
-
-  &::-webkit-scrollbar {
-    display: none;
-  }
+  `};
 `;
 
 const StyledMenuHeader = styled.h2`
@@ -96,13 +93,17 @@ const StyledMenuHeader = styled.h2`
 `;
 
 const MenuItemWrapper = styled.ul`
-  display: flex;
-  flex-direction: column;
-  padding-left: 0;
   margin-bottom: 0;
   margin-top: 0;
   list-style: none;
   padding: 0;
+  overflow-y: auto;
+  overscroll-behavior: none;
+  touch-action: pan-y;
+
+  &::-webkit-scrollbar {
+    display: none;
+  }
 `;
 
 const HamburgerButton = styled(ButtonBase)<ExpandableComponentProps>`
diff --git a/gbajs3/src/index.css b/gbajs3/src/index.css
index b013cfde..7198ce37 100644
--- a/gbajs3/src/index.css
+++ b/gbajs3/src/index.css
@@ -34,3 +34,8 @@ body {
   background-color: #212529;
   font-family: 'Calibri', 'Verdana', sans-serif;
 }
+
+html,
+body {
+  overscroll-behavior: none;
+}