Move Navigate commands to be earlier so they aren't scheduled. Fixes #761