Improved navigation on return command