diff --git a/packages/account/src/Containers/account.jsx b/packages/account/src/Containers/account.jsx
index 4a87da559227..aae57fba274d 100644
--- a/packages/account/src/Containers/account.jsx
+++ b/packages/account/src/Containers/account.jsx
@@ -59,11 +59,15 @@ const PageOverlayWrapper = ({
     subroutes,
     history,
 }) => {
-    const is_from_traders_hub = () => (is_pre_appstore ? history.push(shared_routes.traders_hub) : onClickClose());
+    const routeToPrevious = () => (is_pre_appstore ? history.push(shared_routes.traders_hub) : onClickClose());
 
     if (isMobile() && selected_route) {
         return (
-            <PageOverlay header={selected_route.getTitle()} onClickClose={onClickClose} is_from_app={is_from_derivgo}>
+            <PageOverlay
+                header={selected_route.getTitle()}
+                onClickClose={routeToPrevious}
+                is_from_app={is_from_derivgo}
+            >
                 <selected_route.component component_icon={selected_route.icon_component} />
             </PageOverlay>
         );
@@ -89,7 +93,7 @@ const PageOverlayWrapper = ({
     }
 
     return (
-        <PageOverlay header={localize('Settings')} onClickClose={is_from_traders_hub} is_from_app={is_from_derivgo}>
+        <PageOverlay header={localize('Settings')} onClickClose={routeToPrevious} is_from_app={is_from_derivgo}>
             <VerticalTab
                 alignment='center'
                 is_floating