diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index 3c435f9..77076fc 100644
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -691,17 +691,23 @@
     char_u	*tooltip;
     static int	did_msg = FALSE;
 
+    if (State & CMDLINE)
+	return;
     menu = (vimmenu_T *)data;
     tooltip = CONVERT_TO_UTF8(menu->strings[MENU_INDEX_TIP]);
     if (tooltip != NULL && utf_valid_string(tooltip, NULL))
     {
 	msg((char *)tooltip);
 	did_msg = TRUE;
+	setcursor();
+	out_flush_cursor(TRUE, FALSE);
     }
     else if (did_msg)
     {
 	msg("");
 	did_msg = FALSE;
+	setcursor();
+	out_flush_cursor(TRUE, FALSE);
     }
     CONVERT_TO_UTF8_FREE(tooltip);
 }
diff --git a/src/version.c b/src/version.c
index 76da319..358ff07 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2720,
+/**/
     2719,
 /**/
     2718,