Keep the edit location when toggle side bar

The fix has landed in v5.8.1:

Thanks again for the feedback!