Index: JvCaptionButton.pas
===================================================================
--- JvCaptionButton.pas	(revision 11075)
+++ JvCaptionButton.pas	(working copy)
@@ -2683,6 +2683,11 @@
         // FToolTipHandle is automatically destroyed when ParentForm handle is destroyed.
         FToolTipHandle := 0;
       end;
+    WM_CLOSE:
+    begin
+      Result := False;
+      DestroyToolTip;
+    end;
     WM_NOTIFY:
       Result := HandleNotify(TWMNotify(Msg));
   else