diff --git a/core/js/js.js b/core/js/js.js
index c1b93a85e3bfb..0d434722c6064 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -640,9 +640,9 @@ Object.assign(window.OC, {
 		var self = this;
 		$menuEl.addClass('menu');
 
-		// On link, the enter key trigger a click event
+		// On link and button, the enter key trigger a click event
 		// Only use the click to avoid two fired events
-		$toggle.on($toggle.prop('tagName') === 'A'
+		$toggle.on(($toggle.prop('tagName') === 'A' || $toggle.prop('tagName') === 'BUTTON')
 			? 'click.menu'
 			: 'click.menu keyup.menu', function(event) {
 			// prevent the link event (append anchor to URL)