diff --git a/src/lib/components/ComfyApp.ts b/src/lib/components/ComfyApp.ts
index 1d83c90..40e4b0e 100644
--- a/src/lib/components/ComfyApp.ts
+++ b/src/lib/components/ComfyApp.ts
@@ -201,6 +201,7 @@ export default class ComfyApp {
 
     private registerNodeTypeOverrides() {
         ComfyApp.node_type_overrides["SaveImage"] = nodes.ComfySaveImageNode;
+        ComfyApp.node_type_overrides["PreviewImage"] = nodes.ComfyPreviewImageNode;
     }
 
     private registerWidgetTypeOverrides() {
diff --git a/src/lib/components/LightboxModal.svelte b/src/lib/components/LightboxModal.svelte
index dbd3750..2c7387f 100644
--- a/src/lib/components/LightboxModal.svelte
+++ b/src/lib/components/LightboxModal.svelte
@@ -26,7 +26,7 @@
  }
 </script>
 
-<div id="lightboxModal" on:keydown={handleKey}>
+<div id="lightboxModal" on:keydown={handleKey} on:click={closeModal}>
     <div class="modalControls gradio-container" on:keydown={handleKey}>
         <span class="modalZoom cursor" title="Toggle zoomed view" on:click={toggleZoom} on:keydown={handleKey}>&#10529;</span>
         <span class="modalTileImage cursor" title="Preview tiling" on:click={previewTiling} on:keydown={handleKey}>&#8862;</span>
diff --git a/src/lib/nodes/ComfySaveImageNode.ts b/src/lib/nodes/ComfyImageNodes.ts
similarity index 77%
rename from src/lib/nodes/ComfySaveImageNode.ts
rename to src/lib/nodes/ComfyImageNodes.ts
index 0beeb97..9a0c739 100644
--- a/src/lib/nodes/ComfySaveImageNode.ts
+++ b/src/lib/nodes/ComfyImageNodes.ts
@@ -10,13 +10,16 @@ export type ComfyImageExecOutput = {
     images: ComfyImageResult[]
 }
 
-export default class ComfySaveImageNode extends ComfyGraphNode {
+/*
+ * Node with a single extra image output widget
+ */
+class ComfyImageNode extends ComfyGraphNode {
     private _imageResults: Array<ComfyImageResult> = [];
     private _galleryWidget: ComfyGalleryWidget;
 
     constructor(title?: any) {
         super(title)
-        this._galleryWidget = new ComfyGalleryWidget("Images", this._imageResults, this);
+        this._galleryWidget = new ComfyGalleryWidget("Images", [], this);
         this.virtualWidgets.push(this._galleryWidget)
     }
 
@@ -32,3 +35,9 @@ export default class ComfySaveImageNode extends ComfyGraphNode {
         this._galleryWidget.setValue(galleryItems)
     }
 }
+
+export class ComfySaveImageNode extends ComfyImageNode {
+}
+
+export class ComfyPreviewImageNode extends ComfyImageNode {
+}
diff --git a/src/lib/nodes/index.ts b/src/lib/nodes/index.ts
index 42a06b5..e355079 100644
--- a/src/lib/nodes/index.ts
+++ b/src/lib/nodes/index.ts
@@ -1,2 +1,2 @@
 export { default as ComfyReroute } from "./ComfyReroute"
-export { default as ComfySaveImageNode } from "./ComfySaveImageNode"
+export { ComfySaveImageNode, ComfyPreviewImageNode } from "./ComfyImageNodes"