diff --git a/src/common/version.h b/src/common/version.h
index cbbd144..4fe5053 100755
--- a/src/common/version.h
+++ b/src/common/version.h
@@ -4,7 +4,7 @@
 /* Auto generated version file. DO NOT MODIFY */
 #define SYMMETRY_VERSION_MAJOR 0
 #define SYMMETRY_VERSION_MINOR 1
-#define SYMMETRY_VERSION_REVISION 329
+#define SYMMETRY_VERSION_REVISION 330
 #define SYMMETRY_VERSION_BRANCH "dev"
 
 #endif
\ No newline at end of file
diff --git a/src/game/editor.c b/src/game/editor.c
index 770ee18..d5408d2 100755
--- a/src/game/editor.c
+++ b/src/game/editor.c
@@ -2589,5 +2589,8 @@ void editor_post_update(struct Editor* editor)
 {
 	if(editor->hovered_entity && !(editor->hovered_entity->flags & EF_ACTIVE))
 		editor->hovered_entity = NULL;
+
+	if(editor->selected_entity && !(editor->selected_entity->flags & EF_ACTIVE))
+		editor_entity_select(editor, NULL);
 }
 
diff --git a/todo.txt b/todo.txt
index 05634c8..b8676e5 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,5 +1,4 @@
 Todo:
-	- Fix crash where if entity selected in editor is deleted in game mode and then returning to editor mode causes a crash
 	- Implement flag for ignoring collisions with certain entities
 	- Implement separate property window for player related variables that can be shown in the editor similar to renderer settings etc
 	- Implement game gui either with a separate nuklear context or as part of existing context
@@ -403,4 +402,5 @@ Done:
 	* Add turret properties to property inspector
 	* Add another ambient sound_source entity as child to enemy entity
 	* Add all sound source properties to propery inspector
-	* Implement Triggers
\ No newline at end of file
+	* Implement Triggers
+	* Fix crash where if entity selected in editor is deleted in game mode and then returning to editor mode causes a crash
\ No newline at end of file