diff --git a/src/views/Wallet/components/TopNavigationAccount/components/Indicator/index.js b/src/views/Wallet/components/TopNavigationAccount/components/Indicator/index.js
index 9a414a7d..0e5eda43 100644
--- a/src/views/Wallet/components/TopNavigationAccount/components/Indicator/index.js
+++ b/src/views/Wallet/components/TopNavigationAccount/components/Indicator/index.js
@@ -6,7 +6,7 @@ import React, { PureComponent } from 'react';
 
 type Props = {
     pathname: string;
-    wrapper: ?HTMLElement;
+    wrapper: () => ?HTMLElement;
 }
 
 type State = {
@@ -71,8 +71,8 @@ class Indicator extends PureComponent<Props, State> {
     handleResize: () => void;
 
     reposition(resetAnimation: boolean = true) {
-        if (!this.props.wrapper) return;
-        const { wrapper } = this.props;
+        const wrapper = this.props.wrapper();
+        if (!wrapper) return;
         const active = wrapper.querySelector('.active');
         if (!active) return;
         const bounds = active.getBoundingClientRect();
diff --git a/src/views/Wallet/components/TopNavigationAccount/index.js b/src/views/Wallet/components/TopNavigationAccount/index.js
index 2d0f105e..05d52489 100644
--- a/src/views/Wallet/components/TopNavigationAccount/index.js
+++ b/src/views/Wallet/components/TopNavigationAccount/index.js
@@ -65,7 +65,7 @@ class TopNavigationAccount extends React.PureComponent<Props> {
                 <StyledNavLink to={`${basePath}/receive`}>Receive</StyledNavLink>
                 <StyledNavLink to={`${basePath}/send`}>Send</StyledNavLink>
                 {/* <StyledNavLink to={`${basePath}/signverify`}>Sign & Verify</StyledNavLink> */}
-                <Indicator pathname={pathname} wrapper={this.wrapper} />
+                <Indicator pathname={pathname} wrapper={() => this.wrapper} />
             </Wrapper>
         );
     }