Working on issue #56; need to close popup first.