diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index facce2aa82..b6f118a721 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -43,6 +43,9 @@
       <TabItem Header="Clipboard">
         <pages:ClipboardPage />
       </TabItem>
+      <TabItem Header="ColorPicker">
+        <pages:ColorPickerPage />
+      </TabItem>
       <TabItem Header="ComboBox">
         <pages:ComboBoxPage />
       </TabItem>
diff --git a/samples/ControlCatalog/Pages/ColorPickerPage.xaml b/samples/ControlCatalog/Pages/ColorPickerPage.xaml
new file mode 100644
index 0000000000..31faf5ff09
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ColorPickerPage.xaml
@@ -0,0 +1,23 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:primitives="clr-namespace:Avalonia.Controls.Primitives;assembly=Avalonia.Controls"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="ControlCatalog.Pages.ColorPickerPage">
+
+  <Grid ColumnDefinitions="Auto,Auto"
+        RowDefinitions="Auto,Auto">
+    <ColorSpectrum Grid.Column="0"
+                   Grid.Row="0"
+                   Color="Red"
+                   Height="256"
+                   Width="256" />
+    <ColorSpectrum Grid.Column="1"
+                   Grid.Row="0"
+                   Color="Red"
+                   Shape="Ring"
+                   Height="256"
+                   Width="256" />
+  </Grid>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/ColorPickerPage.xaml.cs b/samples/ControlCatalog/Pages/ColorPickerPage.xaml.cs
new file mode 100644
index 0000000000..6e017e381f
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ColorPickerPage.xaml.cs
@@ -0,0 +1,19 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace ControlCatalog.Pages
+{
+    public partial class ColorPickerPage : UserControl
+    {
+        public ColorPickerPage()
+        {
+            InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}