diff --git a/frontend/src/lib/components/SimpleEditor.svelte b/frontend/src/lib/components/SimpleEditor.svelte
index 7e339bdbf4..bda67dbfa9 100644
--- a/frontend/src/lib/components/SimpleEditor.svelte
+++ b/frontend/src/lib/components/SimpleEditor.svelte
@@ -208,6 +208,7 @@
 		})
 
 		editor.onDidBlurEditorText(() => {
+			dispatch('blur')
 			code = getCode()
 		})
 
diff --git a/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/EvalV2InputEditor.svelte b/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/EvalV2InputEditor.svelte
index 31dce75230..71823119a3 100644
--- a/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/EvalV2InputEditor.svelte
+++ b/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/EvalV2InputEditor.svelte
@@ -104,7 +104,7 @@
 					>
 						<Highlight
 							language={json}
-							code={JSON.stringify($evalPreview[`${id}.${field}`] ?? null, null, 4)}
+							code={JSON.stringify($evalPreview[`${id}.${field}`] ?? null, null, 4) ?? 'null'}
 						/>
 					</div>
 				</div>