diff --git a/src/components/help/HelpView.tsx b/src/components/help/HelpView.tsx
index 7a257be7..e0df417c 100644
--- a/src/components/help/HelpView.tsx
+++ b/src/components/help/HelpView.tsx
@@ -70,8 +70,6 @@ export const HelpView: FC<{}> = props =>
 
         setIsVisible(true);
     }, [ activeReport ]);
-
-    if(!isVisible && !activeReport) return null;
     
     const CurrentStepView = () =>
     {
@@ -97,19 +95,20 @@ export const HelpView: FC<{}> = props =>
 
     return (
         <>
-            <NitroCardView className="nitro-help" theme="primary-slim">
-                <NitroCardHeaderView headerText={ LocalizeText('help.button.cfh') } onCloseClick={ onClose } />
-                <NitroCardContentView className="text-black">
-                    <Grid>
-                        <Column center size={ 5 } overflow="hidden">
-                            <Base className="index-image" />
-                        </Column>
-                        <Column justifyContent="between" size={ 7 } overflow="hidden">
-                            <CurrentStepView />
-                        </Column>
-                    </Grid>
-                </NitroCardContentView>
-            </NitroCardView>
+            { isVisible &&
+                <NitroCardView className="nitro-help" theme="primary-slim">
+                    <NitroCardHeaderView headerText={ LocalizeText('help.button.cfh') } onCloseClick={ onClose } />
+                    <NitroCardContentView className="text-black">
+                        <Grid>
+                            <Column center size={ 5 } overflow="hidden">
+                                <Base className="index-image" />
+                            </Column>
+                            <Column justifyContent="between" size={ 7 } overflow="hidden">
+                                <CurrentStepView />
+                            </Column>
+                        </Grid>
+                    </NitroCardContentView>
+                </NitroCardView> }
             <SanctionSatusView />
             <NameChangeView />
         </>
diff --git a/src/components/help/views/name-change/NameChangeView.tsx b/src/components/help/views/name-change/NameChangeView.tsx
index d4959efc..5cc76a9a 100644
--- a/src/components/help/views/name-change/NameChangeView.tsx
+++ b/src/components/help/views/name-change/NameChangeView.tsx
@@ -17,13 +17,11 @@ export const NameChangeView:FC<{}> = props =>
     const [ layout, setLayout ] = useState<string>(INIT);
     const [ newUsername, setNewUsername ] = useState<string>('');
 
-    const onHelpNameChangeEvent = useCallback((event: HelpNameChangeEvent) =>
+    useUiEvent<HelpNameChangeEvent>(HelpNameChangeEvent.INIT, event =>
     {
         setLayout(INIT);
         setIsVisible(true);
-    }, []);
-
-    useUiEvent(HelpNameChangeEvent.INIT, onHelpNameChangeEvent);
+    });
 
     const onAction = useCallback((action: string, value?: string) =>
     {