diff --git a/app/views/layouts/_lightbox.html.erb b/app/views/layouts/_lightbox.html.erb
index 1f5ad9105..91f3af7bc 100644
--- a/app/views/layouts/_lightbox.html.erb
+++ b/app/views/layouts/_lightbox.html.erb
@@ -1,10 +1,10 @@
 <dialog class="lightbox" aria-label="Image Viewer (Press escape to close)" data-lightbox-target="dialog" data-action="close->lightbox#reset">
   <img src="" class="lightbox__image" data-lightbox-target="zoomedImage" />
 
-  <form method="dialog" class="lightbox__btn">
-    <button class="btn fill-white" title="Close (esc)">
+  <div class="lightbox__btn">
+    <button class="btn fill-white" title="Close (esc)" data-action="keydown.esc->lightbox#close:stop" data-controller="hotkey">
       <%= icon_tag "remove" %>
       <span class="for-screen-reader">Close image viewer (esc)</span>
     </button>
-  </form>
+  </div>
 </dialog>