diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index 99ddce0757..4e2dfb9969 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -32,6 +32,9 @@
     <EmbeddedResource Include="MainView.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Pages\DialogsPage.xaml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="Pages\BorderPage.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
@@ -86,6 +89,9 @@
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\DialogsPage.xaml.cs">
+      <DependentUpon>DialogsPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Pages\BorderPage.xaml.cs">
       <DependentUpon>BorderPage.xaml</DependentUpon>
     </Compile>
diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index 7dd026c124..6c432a90ac 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -1,7 +1,7 @@
 <UserControl xmlns="https://github.com/avaloniaui"
         xmlns:pages="clr-namespace:ControlCatalog.Pages;assembly=ControlCatalog"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <TabControl Classes="sidebar">
+  <TabControl Classes="sidebar" Name="Sidebar">
     <TabControl.Transition>
       <CrossFade Duration="0.25"/>
     </TabControl.Transition>
diff --git a/samples/ControlCatalog/MainView.xaml.cs b/samples/ControlCatalog/MainView.xaml.cs
index 2e1f7d38b2..f065be55aa 100644
--- a/samples/ControlCatalog/MainView.xaml.cs
+++ b/samples/ControlCatalog/MainView.xaml.cs
@@ -1,6 +1,9 @@
+using System.Collections;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using Avalonia.Platform;
+using ControlCatalog.Pages;
 
 namespace ControlCatalog
 {
@@ -9,6 +12,12 @@ namespace ControlCatalog
         public MainView()
         {
             this.InitializeComponent();
+            if (AvaloniaLocator.Current.GetService<IRuntimePlatform>().GetRuntimeInfo().IsDesktop)
+                ((IList) this.FindControl<TabControl>("Sidebar").Items).Add(new TabItem()
+                {
+                    Header = "System dialogs",
+                    Content = new DialogsPage()
+                });
         }
 
         private void InitializeComponent()
diff --git a/samples/ControlCatalog/MainWindow.xaml.cs b/samples/ControlCatalog/MainWindow.xaml.cs
index 65c37c898b..ed0bffdf10 100644
--- a/samples/ControlCatalog/MainWindow.xaml.cs
+++ b/samples/ControlCatalog/MainWindow.xaml.cs
@@ -11,7 +11,7 @@ namespace ControlCatalog
         {
             this.InitializeComponent();
             this.AttachDevTools();
-            Renderer.DrawDirtyRects = Renderer.DrawFps = true;
+            //Renderer.DrawDirtyRects = Renderer.DrawFps = true;
         }
 
         private void InitializeComponent()
diff --git a/samples/ControlCatalog/Pages/DialogsPage.xaml b/samples/ControlCatalog/Pages/DialogsPage.xaml
new file mode 100644
index 0000000000..12be105469
--- /dev/null
+++ b/samples/ControlCatalog/Pages/DialogsPage.xaml
@@ -0,0 +1,11 @@
+<UserControl xmlns="https://github.com/avaloniaui">
+  <StackPanel Orientation="Vertical" Gap="4" Margin="4">
+      <Button Name="OpenFile">Open File</Button>
+      <Button Name="SaveFile">Save File</Button>
+      <Button Name="SelectFolder">Select Folder</Button>
+      <StackPanel Orientation="Horizontal">
+          <CheckBox Name="IsModal" IsChecked="True"/>
+          <TextBlock>Modal to window</TextBlock>
+      </StackPanel>
+  </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/samples/ControlCatalog/Pages/DialogsPage.xaml.cs b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
new file mode 100644
index 0000000000..e9c95c20e4
--- /dev/null
+++ b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
@@ -0,0 +1,42 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+#pragma warning disable 4014
+
+namespace ControlCatalog.Pages
+{
+    public class DialogsPage : UserControl
+    {
+        public DialogsPage()
+        {
+            this.InitializeComponent();
+            this.FindControl<Button>("OpenFile").Click += delegate
+            {
+                new OpenFileDialog()
+                {
+                    Title = "Open file"
+                }.ShowAsync(GetWindow());
+            };
+            this.FindControl<Button>("SaveFile").Click += delegate
+            {
+                new SaveFileDialog()
+                {
+                    Title = "Save file"
+                }.ShowAsync(GetWindow());
+            };
+            this.FindControl<Button>("SelectFolder").Click += delegate
+            {
+                new OpenFolderDialog()
+                {
+                    Title = "Select folder"
+                }.ShowAsync(GetWindow());
+            };
+        }
+
+        Window GetWindow() => this.FindControl<CheckBox>("IsModal").IsChecked ? (Window)this.VisualRoot : null;
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}