LUN-1653: Fix navigation popup not closing
Merge pull request #31 from pbs/LUN-1653

Lun 1653