diff --git a/client/themes/splynx/components/image-modal.vue b/client/themes/splynx/components/image-modal.vue
index da1f0c8c..38c589ee 100644
--- a/client/themes/splynx/components/image-modal.vue
+++ b/client/themes/splynx/components/image-modal.vue
@@ -31,11 +31,29 @@ export default {
     close() {
       this.dialog = false;
     },
+    focusDialog() {
+      this.$nextTick(() => {
+        setTimeout(() => {
+          const dialogEl = document.querySelector('.v-dialog--active');
+          if (dialogEl) {
+            dialogEl.setAttribute('tabindex', '1');
+            dialogEl.focus();
+          }
+        }, 1000);
+      });
+    }
   },
   mounted() {
     this.$root.$on('openImageModal', (photoUrl, photoAlt) => {
       this.open(photoUrl, photoAlt);
     });
   },
+  watch: {
+    dialog(val) {
+     if (val) {
+       this.focusDialog();
+     }
+    },
+  },
 };
 </script>