diff --git a/game/addons/tools/Code/Editor/ControlSheet/FeatureTabWidget.cs b/game/addons/tools/Code/Editor/ControlSheet/FeatureTabWidget.cs
index f346bfac..eca2374e 100644
--- a/game/addons/tools/Code/Editor/ControlSheet/FeatureTabWidget.cs
+++ b/game/addons/tools/Code/Editor/ControlSheet/FeatureTabWidget.cs
@@ -288,6 +288,12 @@ public void RemoveFeature()
 		}
 
 		UpdateVisibility();
+
+		// Mark workspace as dirty when removing a feature
+		if ( SceneEditorSession.Active is not null )
+		{
+			SceneEditorSession.Active.HasUnsavedChanges = true;
+		}
 	}
 
 	protected override void OnContextMenu( ContextMenuEvent e )
@@ -354,6 +360,12 @@ public void SetFeatureEnabled()
 		FeatureEnabled.As.Bool = true;
 		UpdateVisibility();
 		Owner.Select( this );
+
+		// Mark workspace as dirty when adding a feature
+		if ( SceneEditorSession.Active is not null )
+		{
+			SceneEditorSession.Active.HasUnsavedChanges = true;
+		}
 	}
 
 	protected override void OnPaint()