Make storage request back button more logical