diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml
index 8ae938e905..c2e5dd18f4 100644
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -232,6 +232,8 @@
 	BodyOrientation:
 		UseClassicFacingFudge: True
 	HitShape:
+	EditorTilesetFilter:
+		Categories: Vehicle
 
 ^Tank:
 	Inherits: ^Vehicle
@@ -294,6 +296,8 @@
 	BodyOrientation:
 		UseClassicFacingFudge: True
 	HitShape:
+	EditorTilesetFilter:
+		Categories: Aircraft
 
 ^Infantry:
 	Inherits@1: ^ExistsInWorld
@@ -395,6 +399,8 @@
 	HitShape:
 		Type: Circle
 			Radius: 128
+	EditorTilesetFilter:
+		Categories: Infantry
 
 ^Soldier:
 	Inherits: ^Infantry
@@ -436,6 +442,8 @@
 	Wanders:
 		MinMoveDelay: 150
 		MaxMoveDelay: 750
+	EditorTilesetFilter:
+		Categories: Civilian infantry
 
 ^ArmedCivilian:
 	Armament:
@@ -502,6 +510,8 @@
 	HitShape:
 		Type: Circle
 			Radius: 128
+	EditorTilesetFilter:
+		Categories: Critter
 
 ^Viceroid:
 	Inherits@1: ^ExistsInWorld
@@ -563,6 +573,8 @@
 	HitShape:
 		Type: Circle
 			Radius: 427
+	EditorTilesetFilter:
+		Categories: Critter
 
 ^Plane:
 	Inherits@1: ^ExistsInWorld
@@ -583,6 +595,8 @@
 	RejectsOrders:
 	Aircraft:
 		CruiseAltitude: 2560
+	EditorTilesetFilter:
+		Categories: Aircraft
 
 ^Ship:
 	Inherits@1: ^ExistsInWorld
@@ -612,6 +626,8 @@
 	Voiced:
 		VoiceSet: VehicleVoice
 	HitShape:
+	EditorTilesetFilter:
+		Categories: Naval
 
 ^Building:
 	Inherits@1: ^ExistsInWorld
@@ -651,6 +667,8 @@
 		GenericName: Structure
 	FrozenUnderFog:
 	Demolishable:
+	EditorTilesetFilter:
+		Categories: Building
 
 ^BaseBuilding:
 	Inherits: ^Building
@@ -685,6 +703,8 @@
 		GenericStancePrefix: false
 		ShowOwnerRow: false
 	FrozenUnderFog:
+	EditorTilesetFilter:
+		Categories: Civilian building
 
 ^CivBuildingHusk:
 	Inherits@1: ^SpriteActor
@@ -699,6 +719,8 @@
 		ShowOwnerRow: false
 	FrozenUnderFog:
 	ScriptTriggers:
+	EditorTilesetFilter:
+		Categories: Husk
 
 ^TechBuilding:
 	Inherits: ^CivBuilding
@@ -714,6 +736,8 @@
 		Range: 3c0
 	Tooltip:
 		ShowOwnerRow: True
+	EditorTilesetFilter:
+		Categories: Tech building
 
 ^CivField:
 	Inherits: ^CivBuilding
@@ -742,6 +766,8 @@
 	WithSpriteBody:
 	FrozenUnderFog:
 	ScriptTriggers:
+	EditorTilesetFilter:
+		Categories: Husk
 
 ^Wall:
 	Inherits@1: ^SpriteActor
@@ -775,6 +801,8 @@
 	ScriptTriggers:
 	Health:
 		HP: 100
+	EditorTilesetFilter:
+		Categories: Wall
 
 ^Tree:
 	Inherits@1: ^SpriteActor
@@ -814,6 +842,8 @@
 	HiddenUnderShroud:
 	ScriptTriggers:
 	HitShape:
+	EditorTilesetFilter:
+		Categories: Tree
 
 ^TreeHusk:
 	Inherits@1: ^SpriteActor
@@ -827,6 +857,8 @@
 		ShowOwnerRow: false
 	FrozenUnderFog:
 	ScriptTriggers:
+	EditorTilesetFilter:
+		Categories: Tree
 
 ^TibTree:
 	Inherits@1: ^SpriteActor
@@ -844,6 +876,8 @@
 		Terrain: Tiberium
 	HiddenUnderShroud:
 	WithMakeAnimation:
+	EditorTilesetFilter:
+		Categories: Resource spawn
 
 ^Rock:
 	Inherits@1: ^SpriteActor
@@ -863,6 +897,7 @@
 	ScriptTriggers:
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+		Categories: Rock
 
 ^CommonHuskDefaults:
 	Inherits@1: ^SpriteActor
@@ -874,6 +909,8 @@
 		Type: CenterPosition
 	WithFacingSpriteBody:
 	HitShape:
+	EditorTilesetFilter:
+		Categories: Husk
 
 ^Husk:
 	Inherits: ^CommonHuskDefaults
@@ -949,6 +986,8 @@
 		Image: crate
 	WithCrateBody:
 		XmasImages: xcratea, xcrateb, xcratec, xcrated
+	EditorTilesetFilter:
+		Categories: System
 
 ^Defense:
 	Inherits: ^BaseBuilding
@@ -959,6 +998,8 @@
 		RequiredForShortGame: false
 	Targetable:
 		TargetTypes: Ground, C4, Structure, Defense
+	EditorTilesetFilter:
+		Categories: Defense
 
 ^DisabledOverlay:
 	WithColoredOverlay@IDISABLE:
diff --git a/mods/cnc/rules/misc.yaml b/mods/cnc/rules/misc.yaml
index 301ef339ae..39f9fc2848 100644
--- a/mods/cnc/rules/misc.yaml
+++ b/mods/cnc/rules/misc.yaml
@@ -45,6 +45,8 @@ mpspawn:
 	RenderSpritesEditorOnly:
 	BodyOrientation:
 		QuantizedFacings: 1
+	EditorTilesetFilter:
+		Categories: System
 
 waypoint:
 	EditorOnlyTooltip:
@@ -56,6 +58,8 @@ waypoint:
 	RenderSpritesEditorOnly:
 	BodyOrientation:
 		QuantizedFacings: 1
+	EditorTilesetFilter:
+		Categories: System
 
 ^fact.colorpicker:
 	Inherits: FACT
@@ -76,6 +80,8 @@ CAMERA:
 	RevealsShroud:
 		Range: 10c0
 		Type: CenterPosition
+	EditorTilesetFilter:
+		Categories: System
 
 CAMERA.small:
 	EditorOnlyTooltip:
@@ -94,6 +100,8 @@ CAMERA.small:
 	RevealsShroud:
 		Range: 6c0
 		Type: CenterPosition
+	EditorTilesetFilter:
+		Categories: System
 
 FLARE:
 	Immobile:
@@ -114,3 +122,5 @@ FLARE:
 	BodyOrientation:
 		QuantizedFacings: 1
 	AutoSelectionSize:
+	EditorTilesetFilter:
+		Categories: System
\ No newline at end of file