Like Jon, I track the current activity I am in as well. However, I use a common button (red button with an X in it) in my settings and most other sections to close the window and return to my previous activity. See below.