diff --git a/client/src/views/fields/attachment-multiple.js b/client/src/views/fields/attachment-multiple.js
index 22ee37958e..3fab48011d 100644
--- a/client/src/views/fields/attachment-multiple.js
+++ b/client/src/views/fields/attachment-multiple.js
@@ -382,7 +382,7 @@ function (Dep, FileUpload) {
 
             let $attachments = this.$attachments;
 
-            let removeLink = '<a role="button" class="remove-attachment pull-right">'+
+            let removeLink = '<a role="button" tabindex="0" class="remove-attachment pull-right">'+
                 '<span class="fas fa-times"></span></a>';
 
             let previewHtml = this.getBoxPreviewHtml(name, type, id);
diff --git a/client/src/views/fields/file.js b/client/src/views/fields/file.js
index ad74cfb11b..f7460bb221 100644
--- a/client/src/views/fields/file.js
+++ b/client/src/views/fields/file.js
@@ -635,7 +635,7 @@ define('views/fields/file', ['views/fields/link', 'helpers/file-upload'], functi
         addAttachmentBox: function (name, type, id) {
             this.$attachment.empty();
 
-            let removeLink = '<a role="button" class="remove-attachment pull-right">' +
+            let removeLink = '<a role="button" tabindex="0" class="remove-attachment pull-right">' +
                 '<span class="fas fa-times"></span></a>';
 
             let previewHtml = this.getBoxPreviewHtml(name, type, id);
diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less
index 957d5ba8b9..c09bdeb27a 100644
--- a/frontend/less/espo/custom.less
+++ b/frontend/less/espo/custom.less
@@ -1876,6 +1876,14 @@ label.attach-file-label {
 .attachment-preview {
     vertical-align: top;
     margin: 3px 0 3px 0;
+
+    > a[data-action="showImagePreview"] {
+        display: inline-block;
+
+        &:focus-visible {
+            outline-offset: 1px;
+        }
+    }
 }
 
 .field > .attachment-block-container > .attachment-block > .attachment-preview {