Return to folder when exiting a course

I have structured my courses in folders, but one thing annoys me. When I exit a course I'm no longer in the folder the course is in.

Steps to reproduce:

1. Select a folder
2. Open a course to edit it
3. Exit back to all courses
4. Suddenly you are not within the folder