diff --git a/src/pages/settings/Profile/CustomStatus/StatusPage.js b/src/pages/settings/Profile/CustomStatus/StatusPage.js index 5d7bb11f4537..e00975a675c0 100644 --- a/src/pages/settings/Profile/CustomStatus/StatusPage.js +++ b/src/pages/settings/Profile/CustomStatus/StatusPage.js @@ -50,7 +50,15 @@ function StatusPage({draftStatus, currentUserPersonalDetails}) { User.clearDraftCustomStatus(); }; - const navigateBackToSettingsPage = useCallback(() => Navigation.goBack(ROUTES.SETTINGS_PROFILE, false, true), []); + const navigateBackToSettingsPage = useCallback(() => { + const topMostReportID = Navigation.getTopmostReportId(); + if (topMostReportID) { + Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(topMostReportID)); + } else { + Navigation.goBack(ROUTES.SETTINGS_PROFILE, false, true); + } + }, []); + const updateStatus = useCallback(() => { User.updateCustomStatus({text: defaultText, emojiCode: defaultEmoji});