diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index ed4b3936ed..eff5a6f148 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -60,6 +60,9 @@
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\ToolTipPage.xaml.cs">
+      <DependentUpon>ToolTipPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Pages\TextBoxPage.xaml.cs">
       <DependentUpon>TextBoxPage.xaml</DependentUpon>
     </Compile>
@@ -220,6 +223,11 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Pages\ToolTipPage.xaml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/samples/ControlCatalog/MainWindow.xaml b/samples/ControlCatalog/MainWindow.xaml
index 14d5f616e2..e262f0d7e5 100644
--- a/samples/ControlCatalog/MainWindow.xaml
+++ b/samples/ControlCatalog/MainWindow.xaml
@@ -14,5 +14,6 @@
     <TabItem Header="LayoutTransformControl"><pages:LayoutTransformControlPage/></TabItem>
     <TabItem Header="Slider"><pages:SliderPage/></TabItem>
     <TabItem Header="TextBox"><pages:TextBoxPage/></TabItem>
+    <TabItem Header="ToolTip"><pages:ToolTipPage/></TabItem>
   </TabControl>
 </Window>
\ No newline at end of file
diff --git a/samples/ControlCatalog/Pages/ToolTipPage.xaml b/samples/ControlCatalog/Pages/ToolTipPage.xaml
new file mode 100644
index 0000000000..b858ece2d2
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ToolTipPage.xaml
@@ -0,0 +1,22 @@
+<UserControl xmlns="https://github.com/perspex">
+  <StackPanel Orientation="Vertical" Gap="4">
+    <TextBlock Classes="h1">ToolTip</TextBlock>
+    <TextBlock Classes="h2">A control which pops up a hint when a control is hovered</TextBlock>
+
+    <StackPanel Orientation="Horizontal"
+              Margin="0,16,0,0"
+              HorizontalAlignment="Center"
+              Gap="16">
+      <Border Background="{StyleResource ThemeAccentBrush}"
+              Padding="48,48,48,48">
+        <ToolTip.Tip>
+          <StackPanel>
+            <TextBlock Classes="h1">ToolTip</TextBlock>
+            <TextBlock Classes="h2">A control which pops up a hint when a control is hovered</TextBlock>
+          </StackPanel>
+        </ToolTip.Tip>
+        <TextBlock>Hover Here</TextBlock>
+      </Border>
+    </StackPanel>
+  </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/samples/ControlCatalog/Pages/ToolTipPage.xaml.cs b/samples/ControlCatalog/Pages/ToolTipPage.xaml.cs
new file mode 100644
index 0000000000..ba488d8b59
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ToolTipPage.xaml.cs
@@ -0,0 +1,18 @@
+using Perspex.Controls;
+using Perspex.Markup.Xaml;
+
+namespace ControlCatalog.Pages
+{
+    public class ToolTipPage : UserControl
+    {
+        public ToolTipPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            PerspexXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/src/Perspex.Controls/ToolTip.cs b/src/Perspex.Controls/ToolTip.cs
index aa850aa1fc..319a24f50b 100644
--- a/src/Perspex.Controls/ToolTip.cs
+++ b/src/Perspex.Controls/ToolTip.cs
@@ -11,7 +11,7 @@ using Perspex.Threading;
 namespace Perspex.Controls
 {
     /// <summary>
-    /// A tooltip control.
+    /// A control which pops up a hint when a control is hovered.
     /// </summary>
     /// <remarks>
     /// You will probably not want to create a <see cref="ToolTip"/> control directly: if added to