diff --git a/core/css/header.scss b/core/css/header.scss
index 41ee0a63fb..52a179cc5c 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -441,6 +441,7 @@ nav[role='navigation'] {
 #appmenu {
 	display: inline-flex;
 	min-width: $header-height;
+	z-index: 2;
 
 	li {
 		position: relative;
@@ -560,7 +561,7 @@ nav[role='navigation'] {
 	}
 
 	#more-apps {
-		z-index: 2;
+		z-index: 3;
 	}
 }
 
diff --git a/core/js/js.js b/core/js/js.js
index 2812cba988..a4de1c3dbf 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -684,7 +684,12 @@ var OCP = {},
 	registerMenu: function($toggle, $menuEl, toggle, headerMenu) {
 		var self = this;
 		$menuEl.addClass('menu');
-		$toggle.on('click.menu keyup.menu', function(event) {
+		
+		// On link, the enter key trigger a click event
+		// Only use the click to avoid two fired events
+		$toggle.on($toggle.prop('tagName') === 'A'
+			? 'click.menu'
+			: 'click.menu keyup.menu', function(event) {
 			// prevent the link event (append anchor to URL)
 			event.preventDefault();
 
@@ -1452,7 +1457,7 @@ function initCore() {
 	function setupMainMenu() {
 
 		// init the more-apps menu
-		OC.registerMenu($('#more-apps'), $('#navigation'));
+		OC.registerMenu($('#more-apps > a'), $('#navigation'));
 
 		// toggle the navigation
 		var $toggle = $('#header .header-appname-container');