diff --git a/core/css/header.scss b/core/css/header.scss
index 5c09bdee82..62ed3e3817 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -88,10 +88,12 @@
 		z-index: 2000;
 		position: absolute;
 		max-width: 350px;
-		max-height: $header-menu-entry-height * 7.5; // half entry
+		min-height: calc(44px * 1.5); // show at least 1.5 entries
+		max-height: calc(100vh - #{$header-height} * 2);
 		right: 5px; // relative to parent
 		top: $header-height;
 		margin: 0;
+		overflow-y: scroll;
 		-webkit-overflow-scrolling: touch;
 
 		&:not(.popovermenu) {
@@ -113,7 +115,7 @@
 
 		/* Use by the apps menu and the settings right menu */
 		#apps > ul,
-		&.settings-menu > ul {
+		&.settings-menu {
 			li {
 				a {
 					display: inline-flex;
@@ -319,13 +321,6 @@ nav[role='navigation'] {
 	}
 }
 
-#apps {
-	max-height: inherit;
-	overflow-x: hidden;
-	overflow-y: auto;
-	-webkit-overflow-scrolling: touch;
-}
-
 /* USER MENU -----------------------------------------------------------------*/
 #settings {
 	display: inline-block;