diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less
index ac56b8f15..b49fb8999 100644
--- a/customize.dist/src/less2/include/modals-ui-elements.less
+++ b/customize.dist/src/less2/include/modals-ui-elements.less
@@ -163,7 +163,7 @@
                     margin-right: @snapshot_spacing;
                 }
             }
-            &:hover {
+            &:hover, &:focus, &:focus-within {
                 .cp-snapshot-buttons {
                     display: flex;
                 }
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 0065cb81e..edb0737de 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -3354,7 +3354,7 @@ define([
                 }
             });
 
-            return h('span.cp-snapshot-element', [
+            return h('span.cp-snapshot-element', {tabindex:0}, [
                 h('i.fa.fa-camera'),
                 h('span.cp-snapshot-title', [
                     h('span', s.title),
@@ -3400,6 +3400,10 @@ define([
 
         modal = UI.openCustomModal(UI.dialog.customModal(content, {buttons: buttons }));
         setTimeout(function () {
+            if (list.length) {
+                $(list[0]).focus();
+                return;
+            }
             $input.focus();
         });
     };