diff --git a/src/components/PasswordForm.tsx b/src/components/PasswordForm.tsx
index 6be5aec08..f18d8436c 100644
--- a/src/components/PasswordForm.tsx
+++ b/src/components/PasswordForm.tsx
@@ -114,11 +114,16 @@ function SetPassword(props: Props) {
                             </Form>
                         )}
                     </Formik>
-                    <div className="text-center" style={{ marginTop: '20px' }}>
-                        <Button variant="link" onClick={props.back}>
-                            {constants.GO_BACK}
-                        </Button>
-                    </div>
+                    {props.back && (
+                        <div
+                            className="text-center"
+                            style={{ marginTop: '20px' }}
+                        >
+                            <Button variant="link" onClick={props.back}>
+                                {constants.GO_BACK}
+                            </Button>
+                        </div>
+                    )}
                 </Card.Body>
             </Card>
         </Container>
diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx
index 7ee2f4d0f..d075925a6 100644
--- a/src/components/Sidebar.tsx
+++ b/src/components/Sidebar.tsx
@@ -3,7 +3,7 @@ import React, { useEffect, useState } from 'react';
 import { slide as Menu } from 'react-burger-menu';
 import billingService, { Subscription } from 'services/billingService';
 import constants from 'utils/strings/constants';
-import { getData, LS_KEYS } from 'utils/storage/localStorage';
+import { getData, LS_KEYS, setData } from 'utils/storage/localStorage';
 import { getToken } from 'utils/common/key';
 import { getEndpoint } from 'utils/common/apiUtil';
 import { Button } from 'react-bootstrap';
@@ -214,7 +214,10 @@ export default function Sidebar(props: Props) {
             </>
             <LinkButton
                 style={{ marginTop: '30px' }}
-                onClick={() => router.push('changePassword')}
+                onClick={() => {
+                    setData(LS_KEYS.SHOW_BACK_BUTTON, { value: true });
+                    router.push('changePassword');
+                }}
             >
                 {constants.CHANGE_PASSWORD}
             </LinkButton>
diff --git a/src/pages/changePassword/index.tsx b/src/pages/changePassword/index.tsx
index d1474f84c..925adc306 100644
--- a/src/pages/changePassword/index.tsx
+++ b/src/pages/changePassword/index.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useContext } from 'react';
 import constants from 'utils/strings/constants';
-import { getData, LS_KEYS } from 'utils/storage/localStorage';
+import { getData, LS_KEYS, setData } from 'utils/storage/localStorage';
 import { useRouter } from 'next/router';
 import { getKey, SESSION_KEYS, setKey } from 'utils/storage/sessionStorage';
 import { B64EncryptionResult } from 'services/uploadService';
@@ -66,14 +66,21 @@ export default function Generate() {
         );
 
         setSessionKeys(key);
+        redirectToGallery();
+    };
+    const redirectToGallery = () => {
+        setData(LS_KEYS.SHOW_BACK_BUTTON, { value: false });
         router.push('/gallery');
     };
-
     return (
         <PasswordForm
             callback={onSubmit}
             buttonText={constants.CHANGE_PASSWORD}
-            back={() => router.push('/gallery')}
+            back={
+                getData(LS_KEYS.SHOW_BACK_BUTTON)?.value
+                    ? redirectToGallery
+                    : null
+            }
         />
     );
 }
diff --git a/src/utils/storage/localStorage.ts b/src/utils/storage/localStorage.ts
index 44d5d1d6c..7ded2e198 100644
--- a/src/utils/storage/localStorage.ts
+++ b/src/utils/storage/localStorage.ts
@@ -6,6 +6,7 @@ export enum LS_KEYS {
     PLANS = 'plans',
     IS_FIRST_LOGIN = 'isFirstLogin',
     JUST_SIGNED_UP = 'justSignedUp',
+    SHOW_BACK_BUTTON = 'showBackButton',
 }
 
 export const setData = (key: LS_KEYS, value: object) => {