Fix for several navigation issues (thanks ossman)

https://github.com/jeroenpardon/skin.refocus/pull/24