Improved behavior when bouncing from viewing the Edit tab