diff --git a/src/popupwin.c b/src/popupwin.c
index 301c382..09ef0a3 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -3711,6 +3711,11 @@
 	// Draw the popup text, unless it's off screen.
 	if (wp->w_winrow < screen_Rows && wp->w_wincol < screen_Columns)
 	{
+	    // May need to update the "cursorline" highlighting, which may also
+	    // change "topline"
+	    if (wp->w_popup_last_curline != wp->w_cursor.lnum)
+		popup_highlight_curline(wp);
+
 	    win_update(wp);
 
 	    // move the cursor into the visible lines, otherwise executing