diff --git a/packages/editor/src/lib/Editor.svelte b/packages/editor/src/lib/Editor.svelte
index 25745da90e..c9c5cf0224 100644
--- a/packages/editor/src/lib/Editor.svelte
+++ b/packages/editor/src/lib/Editor.svelte
@@ -118,6 +118,7 @@
 				});
 
 				editor_states.set(file.name, state);
+				editor_view.setState(state);
 			}
 		}
 	}
@@ -134,14 +135,11 @@
 	}
 
 	function select_state(selected_name: string | null) {
-		const state =
-			(selected_name && editor_states.get(selected_name)) ||
-			EditorState.create({
-				doc: '',
-				extensions: [EditorState.readOnly.of(true)]
-			});
+		const state = selected_name && editor_states.get(selected_name);
 
-		editor_view.setState(state);
+		if (state) {
+			editor_view.setState(state);
+		}
 	}
 
 	$effect(() => {
diff --git a/packages/repl/src/lib/Input/ComponentSelector.svelte b/packages/repl/src/lib/Input/ComponentSelector.svelte
index 387bb2c22d..433565002c 100644
--- a/packages/repl/src/lib/Input/ComponentSelector.svelte
+++ b/packages/repl/src/lib/Input/ComponentSelector.svelte
@@ -50,6 +50,7 @@
 
 		handle_select(edited_file.name);
 		rebundle();
+		workspace.invalidate();
 
 		editing_name = null;
 	}