diff --git a/src/gui_w32.c b/src/gui_w32.c
index 463351eea..20e94c369 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -4836,6 +4836,7 @@ make_tooltip(beval, text, pt)
 delete_tooltip(beval)
     BalloonEval	*beval;
 {
+    PostMessage(beval->balloon, WM_CLOSE, 0, 0);
     PostMessage(beval->balloon, WM_DESTROY, 0, 0);
     PostMessage(beval->balloon, WM_NCDESTROY, 0, 0);
 }
diff --git a/src/version.c b/src/version.c
index a69d93dc4..b842fcf76 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    840,
 /**/
     839,
 /**/