Committed as r952794, backported as r952797. There is an ugly side effect that clicking away the year popup will cause a notification (which previously was not reached, because the event loop was never terminated on outside clicks). I will look into changing that later.