diff --git a/src/globals.h b/src/globals.h
index 1a50649..cd8893b 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -736,6 +736,9 @@
 // Set to TRUE if there is any visible popup window.
 EXTERN int	popup_visible INIT(= FALSE);
 
+// Set to TRUE if a visible popup window may use a MOUSE_MOVE event
+EXTERN int	popup_uses_mouse_move INIT(= FALSE);
+
 EXTERN int	text_prop_frozen INIT(= 0);
 #endif
 
diff --git a/src/gui.c b/src/gui.c
index fb589fc..3e383a4 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -4968,7 +4968,7 @@
     gui_mouse_focus(x, y);
 
 #ifdef FEAT_PROP_POPUP
-    if (popup_visible)
+    if (popup_uses_mouse_move)
 	// Generate a mouse-moved event, so that the popup can perhaps be
 	// closed, just like in the terminal.
 	gui_send_mouse_event(MOUSE_MOVE, x, y, FALSE, 0);
diff --git a/src/popupwin.c b/src/popupwin.c
index 0aca7d3..55f98f8 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -150,6 +150,29 @@
     wp->w_popup_mouse_maxcol = mouse_col;
 }
 
+    static void
+update_popup_uses_mouse_move(void)
+{
+    popup_uses_mouse_move = FALSE;
+    if (popup_visible)
+    {
+	win_T *wp;
+
+	FOR_ALL_POPUPWINS(wp)
+	    if (wp->w_popup_mouse_row != 0)
+	    {
+		popup_uses_mouse_move = TRUE;
+		return;
+	    }
+	FOR_ALL_POPUPWINS_IN_TAB(curtab, wp)
+	    if (wp->w_popup_mouse_row != 0)
+	    {
+		popup_uses_mouse_move = TRUE;
+		return;
+	    }
+    }
+}
+
 /*
  * Used when popup options contain "moved" with "word" or "WORD".
  */
@@ -3586,7 +3609,7 @@
 /*
  * Update "popup_mask" if needed.
  * Also recomputes the popup size and positions.
- * Also updates "popup_visible".
+ * Also updates "popup_visible" and "popup_uses_mouse_move".
  * Also marks window lines for redrawing.
  */
     void
@@ -3755,6 +3778,8 @@
 
 	vim_free(plines_cache);
     }
+
+    update_popup_uses_mouse_move();
 }
 
 /*
diff --git a/src/version.c b/src/version.c
index 39eefb5..693cebc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4619,
+/**/
     4618,
 /**/
     4617,