Fix popup sizes in flat skins.  Fixes #331