on behalf of Manoj Kumar K: It's not necessary to save the change before switching to table view

Fixes Issue 5249
Fixes Issue 2598