fixed issue #949 using @alexkirmse's patch
Fixed issue with mobile nav choosing the last option by default. Fixes #950.
Merge commit '43751b76d3a3e217b367fa5581ef6032379d1c49'