diff --git a/docs/changes.txt b/docs/changes.txt
index 5a493a4d3e..bb0a2ba45c 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -520,6 +520,7 @@ MSW:
 - Add support for horizontal mouse wheel events (Lauri Nurmi).
 - Implement wxGraphicsContext::SetInterpolationQuality() (Eric Jensen).
 - Fix coordinate handling in wxDC::Blit() when source DC is a DIB.
+- Fix handling of composite windows in wxToolTip (Armel Asselin).
 
 OSX:
 
diff --git a/src/msw/tooltip.cpp b/src/msw/tooltip.cpp
index 853b96ac63..23ad01cbd4 100644
--- a/src/msw/tooltip.cpp
+++ b/src/msw/tooltip.cpp
@@ -502,7 +502,7 @@ void wxToolTip::SetWindow(wxWindow *win)
     // add the window itself
     if ( m_window )
     {
-        AddOtherWindow(m_window->GetHWND());
+        DoAddHWND(m_window->GetHWND());
     }
 #if !defined(__WXUNIVERSAL__)
     // and all of its subcontrols (e.g. radio buttons in a radiobox) as well