diff --git a/AppKit/CPControl.j b/AppKit/CPControl.j
index b34d5ebfe..0df00d6c6 100644
--- a/AppKit/CPControl.j
+++ b/AppKit/CPControl.j
@@ -94,8 +94,6 @@ var CPControlBlackColor = [CPColor blackColor];
     BOOL                _trackingWasWithinFrame;
     unsigned            _trackingMouseDownFlags;
     CGPoint             _previousTrackingLocation;
-
-    CPString            _toolTip @accessors(property=toolTip);
 }
 
 + (CPDictionary)themeAttributes
diff --git a/AppKit/CPView.j b/AppKit/CPView.j
index 58b37ea70..a4d85e7aa 100644
--- a/AppKit/CPView.j
+++ b/AppKit/CPView.j
@@ -186,6 +186,8 @@ var CPViewFlags                     = { },
     CPView              _previousKeyView;
 
     unsigned            _viewClassFlags;
+
+    CPString            _toolTip @accessors(property=toolTip);
 }
 
 /*
diff --git a/AppKit/_CPToolTip.j b/AppKit/_CPToolTip.j
index 82346eca1..0f3a74b35 100644
--- a/AppKit/_CPToolTip.j
+++ b/AppKit/_CPToolTip.j
@@ -118,7 +118,7 @@ CPToolTipDefaultColorMask = CPAttachedBlackWindowMask;
 
 @end
 
-@implementation CPControl (Tooltips)
+@implementation CPView (Tooltips)
 
 /*!
     Sets the tooltip for the receiver.
@@ -176,14 +176,6 @@ CPToolTipDefaultColorMask = CPAttachedBlackWindowMask;
     }
 }
 
-/*!
-    Returns the receiver's tooltip
-*/
-- (CPString)toolTip
-{
-    return _toolTip;
-}
-
 /*! @ignore
     starts the tooltip timer
 */
@@ -229,4 +221,4 @@ CPToolTipDefaultColorMask = CPAttachedBlackWindowMask;
     CPCurrentToolTip = [_CPToolTip toolTipWithString:_toolTip forView:self];
 }
 
-@end
\ No newline at end of file
+@end