diff --git a/javascript/imageviewer.js b/javascript/imageviewer.js
index 6ca2b4a9..95b8108d 100644
--- a/javascript/imageviewer.js
+++ b/javascript/imageviewer.js
@@ -53,6 +53,9 @@ function modalKeyHandler(event){
         case "ArrowRight":
             modalNextImage(event)
             break;
+        case "Escape":
+            closeModal();
+            break;
     }
 }
 
diff --git a/modules/processing.py b/modules/processing.py
index 39029e8e..b237b3c5 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -102,7 +102,7 @@ class Processed:
             "prompt": self.prompt if type(self.prompt) != list else self.prompt[0],
             "negative_prompt": self.negative_prompt if type(self.negative_prompt) != list else self.negative_prompt[0],
             "seed": int(self.seed if type(self.seed) != list else self.seed[0]),
-            "subseed": int(self.subseed if type(self.subseed) != list else self.subseed[0]),
+            "subseed": int(self.subseed if type(self.subseed) != list else self.subseed[0]) if self.subseed is not None else -1,
             "subseed_strength": self.subseed_strength,
             "width": self.width,
             "height": self.height,