Fix popup (issue #20).