diff --git a/script.js b/script.js
index 9e3d42b58..276158e92 100644
--- a/script.js
+++ b/script.js
@@ -83,35 +83,53 @@ function closeModal() {
 function showModal(event) {
   var source = event.target || event.srcElement;
   gradioApp().getElementById("modalImage").src = source.src
-  gradioApp().getElementById("lightboxModal").style.display = "block";
+  var lb = gradioApp().getElementById("lightboxModal")
+  lb.style.display = "block";
+  lb.focus()
   event.stopPropagation()
 }
 
-
-function showGalleryImage(){
-    setTimeout(function() {
-        fullImg_preview = gradioApp().querySelectorAll('img.w-full.object-contain')
-        
-        if(fullImg_preview != null){
-            fullImg_preview.forEach(function function_name(e) {
-                if(e && e.parentElement.tagName == 'DIV'){
-
-                    e.style.cursor='pointer'
-
-                    e.addEventListener('click', function (evt) {
-                      showModal(evt)
-
-                    },true);
-                }
-            });
-        }
-
-    }, 100);
+function negmod(n, m) {
+  return ((n % m) + m) % m;
 }
 
-function galleryImageHandler(e){
-    if(e && e.parentElement.tagName == 'BUTTON'){
-        e.onclick = showGalleryImage;
+function modalImageSwitch(offset){
+  var galleryButtons = gradioApp().querySelectorAll(".gallery-item.transition-all")
+
+  if(galleryButtons.length>1){
+      var currentButton  = gradioApp().querySelector(".gallery-item.transition-all.\\!ring-2")
+
+      var result = -1
+      galleryButtons.forEach(function(v, i){ if(v==currentButton) { result = i } })
+
+      if(result != -1){
+        nextButton = galleryButtons[negmod((result+offset),galleryButtons.length)]
+        nextButton.click()
+        gradioApp().getElementById("modalImage").src = nextButton.children[0].src
+        setTimeout( function(){gradioApp().getElementById("lightboxModal").focus()},10)
+      }
+  }
+
+}
+
+function modalNextImage(event){
+  modalImageSwitch(1)
+  event.stopPropagation()
+}
+
+function modalPrevImage(event){
+  modalImageSwitch(-1)  
+  event.stopPropagation()
+}
+
+function modalKeyHandler(event){
+    switch (event.key) {
+        case "ArrowLeft":
+            modalPrevImage(event)
+            break;
+        case "ArrowRight":
+            modalNextImage(event)
+            break;
     }
 }
 
@@ -185,13 +203,35 @@ document.addEventListener("DOMContentLoaded", function() {
     modalClose.innerHTML = '×'
     modalClose.onclick = closeModal;
     modal.id = "lightboxModal";
+    modal.tabIndex=0
+    modal.addEventListener('keydown', modalKeyHandler, true)
     modal.appendChild(modalClose)
 
     const modalImage = document.createElement('img')
     modalImage.id = 'modalImage';
     modalImage.onclick = closeModal;
+    modalImage.tabIndex=0
+    modalImage.addEventListener('keydown', modalKeyHandler, true)
     modal.appendChild(modalImage)
 
+    const modalPrev = document.createElement('a')
+    modalPrev.className = 'modalPrev';
+    modalPrev.innerHTML = '❮'
+    modalPrev.tabIndex=0
+    modalPrev.addEventListener('click',modalPrevImage,true);
+    modalPrev.addEventListener('keydown', modalKeyHandler, true)
+    modal.appendChild(modalPrev)
+
+    const modalNext = document.createElement('a')
+    modalNext.className = 'modalNext';
+    modalNext.innerHTML = '❯'
+    modalNext.tabIndex=0
+    modalNext.addEventListener('click',modalNextImage,true);
+    modalNext.addEventListener('keydown', modalKeyHandler, true)
+
+    modal.appendChild(modalNext)
+
+
     gradioApp().getRootNode().appendChild(modal)
     
     document.body.appendChild(modalFragment);