diff --git a/CHANGELOG b/CHANGELOG
index 1d19909214..4c3c330f15 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -110,6 +110,7 @@ NEW:
 		Fixed Obelisk of Light charge animation and sound not playing.
 		Replaced or improved several mouse cursors.
 		Added Minibibs for bibless buildings.
+		The Construction Yard fans now turn in the color picker preview.
 	Engine:
 		Converted Aircraft CruiseAltitude to world coordinates.
 		Converted Health Radius to world coordinates.
diff --git a/OpenRA.Mods.RA/Widgets/Logic/ColorPickerLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/ColorPickerLogic.cs
index 9ebb8231b1..56aa541566 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/ColorPickerLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/ColorPickerLogic.cs
@@ -20,6 +20,15 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 		[ObjectCreator.UseCtor]
 		public ColorPickerLogic(Widget widget, HSLColor initialColor, Action<HSLColor> onChange, WorldRenderer worldRenderer)
 		{
+			var ticker = widget.GetOrNull<LogicTickerWidget>("ANIMATE_PREVIEW");
+			if (ticker != null)
+			{
+				var preview = widget.Get<SpriteSequenceWidget>("PREVIEW");
+				var anim = preview.GetAnimation();
+				anim.PlayRepeating(anim.CurrentSequence.Name);
+				ticker.OnTick = () => anim.Tick();
+			}
+
 			var hueSlider = widget.Get<SliderWidget>("HUE");
 			var mixer = widget.Get<ColorMixerWidget>("MIXER");
 			var randomButton = widget.GetOrNull<ButtonWidget>("RANDOM_BUTTON");
diff --git a/mods/cnc/chrome/color-picker.yaml b/mods/cnc/chrome/color-picker.yaml
index e8c2c35b0f..4084b7e437 100644
--- a/mods/cnc/chrome/color-picker.yaml
+++ b/mods/cnc/chrome/color-picker.yaml
@@ -4,6 +4,7 @@ Background@COLOR_CHOOSER:
 	Width:234
 	Height:105
 	Children:
+		LogicTicker@ANIMATE_PREVIEW:
 		Background@HUEBG:
 			Background:panel-black
 			X:5
@@ -29,7 +30,7 @@ Background@COLOR_CHOOSER:
 					Y:2
 					Width:144
 					Height:72
-		SpriteSequence@FACT:
+		SpriteSequence@PREVIEW:
 			X:153
 			Y:1
 			Width:80