Fix back button not working

Change-Id: I4f34e27e784f18222981a09a8249246faff5afe0