diff --git a/src/popupwin.c b/src/popupwin.c
index 6e1d925..c34ee9f 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -2413,8 +2413,7 @@
 	    win_enter(owp, FALSE);
 	else
 	{
-	    for (owp = curtab->tp_first_popupwin; owp != NULL;
-							     owp = owp->w_next)
+	    FOR_ALL_POPUPWINS_IN_TAB(curtab, owp)
 		if (owp != curwin && owp->w_buffer->b_term != NULL)
 		    break;
 	    if (owp != NULL)