diff --git a/src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorSpectrum.cs b/src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorSpectrum.cs
index 47b113b0de..ef07e56f10 100644
--- a/src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorSpectrum.cs
+++ b/src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorSpectrum.cs
@@ -526,7 +526,6 @@ namespace Avalonia.Controls.Primitives
             //    VisualStateManager.GoToState(this, "Normal", useTransitions);
             //}
 
-            //VisualStateManager.GoToState(this, m_shapeFromLastBitmapCreation == ColorSpectrumShape.Box ? "BoxSelected" : "RingSelected", useTransitions);
             //VisualStateManager.GoToState(this, SelectionEllipseShouldBeLight() ? "SelectionEllipseLight" : "SelectionEllipseDark", useTransitions);
 
             //if (IsEnabled && FocusState != FocusState.Unfocused)
diff --git a/src/Avalonia.Themes.Fluent/Controls/ColorSpectrum.xaml b/src/Avalonia.Themes.Fluent/Controls/ColorSpectrum.xaml
index c4ca09d439..0d6ed59c68 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ColorSpectrum.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ColorSpectrum.xaml
@@ -1,11 +1,13 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:CompileBindings="True">
+        x:CompileBindings="True"
+        xmlns:converters="using:Avalonia.Controls.Converters">
 
   <Design.PreviewWith>
   </Design.PreviewWith>
 
   <Styles.Resources>
+    <converters:EnumValueEqualsConverter x:Key="EnumValueEquals" />
   </Styles.Resources>
 
   <Style Selector="ColorSpectrum">
@@ -22,25 +24,27 @@
               <Rectangle x:Name="PART_SpectrumRectangle"
                          IsHitTestVisible="False"
                          HorizontalAlignment="Stretch"
-                         VerticalAlignment="Stretch" />
+                         VerticalAlignment="Stretch"
+                         IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumValueEquals}, ConverterParameter='Box'}" />
                          <!--RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
                          RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />-->
               <Rectangle x:Name="PART_SpectrumOverlayRectangle"
                          IsHitTestVisible="False"
                          HorizontalAlignment="Stretch"
-                         VerticalAlignment="Stretch" />
+                         VerticalAlignment="Stretch"
+                         IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumValueEquals}, ConverterParameter='Box'}" />
                          <!--RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
                          RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />-->
               <Ellipse x:Name="PART_SpectrumEllipse"
                        IsHitTestVisible="False"
                        HorizontalAlignment="Stretch"
                        VerticalAlignment="Stretch"
-                       IsVisible="False" />
+                       IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumValueEquals}, ConverterParameter='Ring'}" />
               <Ellipse x:Name="PART_SpectrumOverlayEllipse"
                        IsHitTestVisible="False"
                        HorizontalAlignment="Stretch"
                        VerticalAlignment="Stretch"
-                       IsVisible="False" />
+                       IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumValueEquals}, ConverterParameter='Ring'}" />
               <Canvas x:Name="PART_InputTarget"
                       Background="Transparent"
                       HorizontalAlignment="Stretch"
@@ -75,16 +79,17 @@
                          StrokeThickness="2"
                          IsHitTestVisible="False"
                          HorizontalAlignment="Stretch"
-                         VerticalAlignment="Stretch" />
+                         VerticalAlignment="Stretch"
+                         IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumValueEquals}, ConverterParameter='Box'}" />
                          <!--RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
                          RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />-->
               <Ellipse x:Name="EllipseBorder"
                        Stroke="{DynamicResource SystemControlForegroundListLowBrush}"
                        StrokeThickness="2"
                        IsHitTestVisible="False"
-                       IsVisible="False"
                        HorizontalAlignment="Stretch"
-                       VerticalAlignment="Stretch" />
+                       VerticalAlignment="Stretch"
+                       IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumValueEquals}, ConverterParameter='Ring'}" />
             </Grid>
           </Grid>
         </ControlTemplate>
@@ -135,34 +140,6 @@
         </VisualState.Setters>
       </VisualState>
     </VisualStateGroup>
-    <VisualStateGroup
-      x:Name="ShapeSelected">
-      <VisualState
-        x:Name="BoxSelected" />
-      <VisualState
-        x:Name="RingSelected">
-        <VisualState.Setters>
-          <Setter
-            Target="SpectrumRectangle.Visibility"
-            Value="Collapsed" />
-          <Setter
-            Target="SpectrumOverlayRectangle.Visibility"
-            Value="Collapsed" />
-          <Setter
-            Target="RectangleBorder.Visibility"
-            Value="Collapsed" />
-          <Setter
-            Target="SpectrumEllipse.Visibility"
-            Value="Visible" />
-          <Setter
-            Target="SpectrumOverlayEllipse.Visibility"
-            Value="Visible" />
-          <Setter
-            Target="EllipseBorder.Visibility"
-            Value="Visible" />
-        </VisualState.Setters>
-      </VisualState>
-    </VisualStateGroup>
     <VisualStateGroup
       x:Name="FocusStates">
       <VisualState