Fix popup menu