diff --git a/CHANGELOG b/CHANGELOG
index 39bc2b1c4..7121bcbd1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@ CHANGELOG Roundcube Webmail
 - Elastic: Fix recipient input bug when using click to select a contact from autocomplete list (#7231)
 - Fix invalid Content-Type for messages with only html part and inline images - Mail_Mime-1.10.7 (#7261)
 - Fix missing contact display name in QR Code data (#7257)
+- Fix so button label in Select image/media dialogs is "Close" not "Cancel" (#7246)
 
 RELEASE 1.4.3
 -------------
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 535da2e09..1ab3dcc4f 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -2098,7 +2098,7 @@ class rcmail extends rcube
             }
         }
 
-        $this->output->add_label('selectimage', 'addimage', 'selectmedia', 'addmedia');
+        $this->output->add_label('selectimage', 'addimage', 'selectmedia', 'addmedia', 'close');
         $this->output->set_env('editor_config', $config);
 
         if ($path = $this->config->get('media_browser_css_location', 'program/resources/tinymce/browser.css')) {
diff --git a/program/js/editor.js b/program/js/editor.js
index e05cf5725..bc504c474 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -664,7 +664,7 @@ function rcube_text_editor(config, id)
       title: rcmail.get_label('select' + type),
       width: 500,
       html: '<div id="image-selector" class="image-selector file-upload"><ul id="image-selector-list" class="attachmentslist"></ul></div>',
-      buttons: [{text: 'Cancel', onclick: function() { ref.file_browser_close(); }}]
+      buttons: [{text: rcmail.get_label('close'), onclick: function() { ref.file_browser_close(); }}]
     });
 
     rcmail.env.file_browser_field = field_name;
diff --git a/skins/elastic/styles/widgets/editor.less b/skins/elastic/styles/widgets/editor.less
index 57e621434..f29af29fb 100644
--- a/skins/elastic/styles/widgets/editor.less
+++ b/skins/elastic/styles/widgets/editor.less
@@ -88,11 +88,12 @@
             right: 0;
             top: 0;
             position: absolute;
-            height: (@layout-header-height - .7rem);
+            height: (@layout-header-height - .75rem);
             width: 1.25em;
-            margin: .25rem;
+            margin: 0 .25rem;
             padding: .1rem .75rem;
             cursor: pointer;
+            outline: 0;
 
             &:before {
                 &:extend(.font-icon-class);