Fix navigation from dialog
Merge pull request #127 from hammer814/fix

Fix navigation from dialog