diff --git a/src/Avalonia.Controls/ToolTip.cs b/src/Avalonia.Controls/ToolTip.cs
index e45f30f818..464e4188d2 100644
--- a/src/Avalonia.Controls/ToolTip.cs
+++ b/src/Avalonia.Controls/ToolTip.cs
@@ -34,25 +34,25 @@ namespace Avalonia.Controls
         /// Defines the ToolTip.Placement property.
         /// </summary>
         public static readonly AttachedProperty<PlacementMode> PlacementProperty =
-            AvaloniaProperty.RegisterAttached<Popup, Control, PlacementMode>("Placement", defaultValue: PlacementMode.Pointer);
+            AvaloniaProperty.RegisterAttached<ToolTip, Control, PlacementMode>("Placement", defaultValue: PlacementMode.Pointer);
 
         /// <summary>
         /// Defines the ToolTip.HorizontalOffset property.
         /// </summary>
         public static readonly AttachedProperty<double> HorizontalOffsetProperty =
-            AvaloniaProperty.RegisterAttached<Popup, Control, double>("HorizontalOffset");
+            AvaloniaProperty.RegisterAttached<ToolTip, Control, double>("HorizontalOffset");
 
         /// <summary>
         /// Defines the ToolTip.VerticalOffset property.
         /// </summary>
         public static readonly AttachedProperty<double> VerticalOffsetProperty =
-            AvaloniaProperty.RegisterAttached<Popup, Control, double>("VerticalOffset", 20);
+            AvaloniaProperty.RegisterAttached<ToolTip, Control, double>("VerticalOffset", 20);
 
         /// <summary>
         /// Defines the ToolTip.ShowDelay property.
         /// </summary>
         public static readonly AttachedProperty<int> ShowDelayProperty =
-            AvaloniaProperty.RegisterAttached<Popup, Control, int>("ShowDelay", 400);
+            AvaloniaProperty.RegisterAttached<ToolTip, Control, int>("ShowDelay", 400);
 
         /// <summary>
         /// Stores the curernt <see cref="ToolTip"/> instance in the control.