diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index 1cddb9d295..8699508320 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -36,6 +36,7 @@
       <TabItem Header="RadioButton"><pages:RadioButtonPage/></TabItem>
       <TabItem Header="Slider"><pages:SliderPage/></TabItem>
       <TabItem Header="TabControl"><pages:TabControlPage/></TabItem>
+      <TabItem Header="TabStrip"><pages:TabStripPage/></TabItem>
       <TabItem Header="TextBox"><pages:TextBoxPage/></TabItem>
       <TabItem Header="ToolTip"><pages:ToolTipPage/></TabItem>
       <TabItem Header="TreeView"><pages:TreeViewPage/></TabItem>
diff --git a/samples/ControlCatalog/Pages/TabStripPage.xaml b/samples/ControlCatalog/Pages/TabStripPage.xaml
new file mode 100644
index 0000000000..a824336f75
--- /dev/null
+++ b/samples/ControlCatalog/Pages/TabStripPage.xaml
@@ -0,0 +1,33 @@
+<UserControl xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.TabStripPage"
+             xmlns="https://github.com/avaloniaui">
+    <StackPanel Orientation="Vertical" Spacing="4">
+        <TextBlock Classes="h1">TabStrip</TextBlock>
+        <TextBlock Classes="h2">A control which displays a selectable strip of tabs</TextBlock>
+
+        <Separator Margin="0 16"/>
+        
+        <TextBlock Classes="h1">Defined in XAML</TextBlock>
+        <TabStrip>
+            <TabStripItem>Item 1</TabStripItem>
+            <TabStripItem>Item 2</TabStripItem>
+            <TabStripItem IsEnabled="False">Disabled</TabStripItem>
+        </TabStrip>
+
+        <Separator Margin="0 16"/>
+
+        <TextBlock Classes="h1">Dynamically generated</TextBlock>
+        <TabStrip Items="{Binding}">
+            <TabStrip.Styles>
+                <Style Selector="TabStripItem">
+                    <Setter Property="IsEnabled" Value="{Binding IsEnabled}"/>
+                </Style>
+            </TabStrip.Styles>
+            <TabStrip.ItemTemplate>
+                <DataTemplate>
+                    <TextBlock Text="{Binding Header}"/>
+                </DataTemplate>
+            </TabStrip.ItemTemplate>
+        </TabStrip>
+    </StackPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/TabStripPage.xaml.cs b/samples/ControlCatalog/Pages/TabStripPage.xaml.cs
new file mode 100644
index 0000000000..f0630cf534
--- /dev/null
+++ b/samples/ControlCatalog/Pages/TabStripPage.xaml.cs
@@ -0,0 +1,45 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform;
+
+namespace ControlCatalog.Pages
+{
+    public class TabStripPage : UserControl
+    {
+        public TabStripPage()
+        {
+            InitializeComponent();
+
+            DataContext = new[]
+            {
+                new TabStripItemViewModel
+                {
+                    Header = "Item 1",
+                },
+                new TabStripItemViewModel
+                {
+                    Header = "Item 2",
+                },
+                new TabStripItemViewModel
+                {
+                    Header = "Disabled",
+                    IsEnabled = false,
+                },
+            };
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        private class TabStripItemViewModel
+        {
+            public string Header { get; set; }
+            public bool IsEnabled { get; set; } = true;
+        }
+    }
+}