diff --git a/samples/ControlCatalog/Pages/ColorPickerPage.xaml b/samples/ControlCatalog/Pages/ColorPickerPage.xaml
index ad54eb95fc..3cb761fb34 100644
--- a/samples/ControlCatalog/Pages/ColorPickerPage.xaml
+++ b/samples/ControlCatalog/Pages/ColorPickerPage.xaml
@@ -14,13 +14,15 @@
     <pc:ThirdComponentConverter x:Key="ThirdComponent" />
   </UserControl.Resources>
 
-  <Grid ColumnDefinitions="Auto,10,Auto,10,Auto"
+  <Grid x:Name="LayoutRoot"
+        ColumnDefinitions="Auto,10,Auto"
         RowDefinitions="Auto,Auto">
     <ColorView Grid.Column="0"
                Grid.Row="0"
                ColorSpectrumShape="Ring" />
     <ColorPicker Grid.Column="0"
                  Grid.Row="1"
+                 HsvColor="hsv(120, 1, 1)"
                  Margin="0,50,0,0">
       <ColorPicker.Palette>
         <controls:FlatColorPalette />
@@ -56,8 +58,5 @@
                       IsAccentColorsVisible="False"
                       HsvColor="{Binding HsvColor, ElementName=ColorSpectrum1}" />
     </Grid>
-    <Grid Grid.Column="4"
-          Grid.Row="0">
-    </Grid>
   </Grid>
 </UserControl>
diff --git a/samples/ControlCatalog/Pages/ColorPickerPage.xaml.cs b/samples/ControlCatalog/Pages/ColorPickerPage.xaml.cs
index 6e017e381f..4671bbdb7c 100644
--- a/samples/ControlCatalog/Pages/ColorPickerPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ColorPickerPage.xaml.cs
@@ -1,6 +1,8 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Layout;
 using Avalonia.Markup.Xaml;
+using Avalonia.Media;
 
 namespace ControlCatalog.Pages
 {
@@ -9,6 +11,20 @@ namespace ControlCatalog.Pages
         public ColorPickerPage()
         {
             InitializeComponent();
+
+            var layoutRoot = this.GetControl<Grid>("LayoutRoot");
+
+            // ColorPicker added from code-behind
+            var colorPicker = new ColorPicker()
+            {
+                Color = Colors.Blue,
+                Margin = new Thickness(0, 50, 0, 0),
+                HorizontalAlignment = HorizontalAlignment.Center,
+            };
+            Grid.SetColumn(colorPicker, 2);
+            Grid.SetRow(colorPicker, 1);
+            
+            layoutRoot.Children.Add(colorPicker);
         }
 
         private void InitializeComponent()