diff --git a/ui/actions/nuxeo-download-button.js b/ui/actions/nuxeo-download-button.js
index 070e89c97..6736beaed 100644
--- a/ui/actions/nuxeo-download-button.js
+++ b/ui/actions/nuxeo-download-button.js
@@ -49,7 +49,7 @@ import '../nuxeo-button-styles.js';
 
         <dom-if if="[[_isAvailable(document)]]">
           <template>
-            <div class="action" on-click="_download" tabindex="0">
+            <div class="action" on-click="_download" tabindex="-1">
               <paper-icon-button
                 icon="[[icon]]"
                 noink
@@ -107,6 +107,15 @@ import '../nuxeo-button-styles.js';
       };
     }
 
+    ready() {
+      super.ready();
+      this.addEventListener('keydown', (event) => {
+        if (event.key === 'Enter') {
+          event.stopPropagation();
+        }
+      });
+    }
+
     _isAvailable(doc) {
       return this.hasContent(doc, this.formatPropertyXpath(this.xpath));
     }