diff --git a/WINGs/wpopupbutton.c b/WINGs/wpopupbutton.c
index b66addf..35d12c2 100644
--- a/WINGs/wpopupbutton.c
+++ b/WINGs/wpopupbutton.c
@@ -757,7 +757,9 @@ static void handleActionEvents(WMEvent * event, void *data)
 					(*bPtr->action) (bPtr, bPtr->clientData);
 			}
 		}
-		if (bPtr->menuView->flags.mapped)
+		if (bPtr->menuView->flags.mapped
+		    && (event->window == bPtr->menuView->window
+		        || bPtr->flags.insideMenu))
 			popDownMenu(bPtr);
 		break;
 	}