diff --git a/src/components/molecules/AccountStatus/Indicator.tsx b/src/components/molecules/AccountStatus/Indicator.tsx
index 0a75427..66d014f 100644
--- a/src/components/molecules/AccountStatus/Indicator.tsx
+++ b/src/components/molecules/AccountStatus/Indicator.tsx
@@ -5,15 +5,17 @@ import styles from './Indicator.module.scss'
 
 const Indicator = ({
     className,
-    showPopover
+    showPopover,
+    hidePopover
 }: {
     className?: string
     showPopover: any
+    hidePopover: any
 }) => (
     <div
         className={cx(styles.status, className)}
-        onClick={showPopover}
         onMouseOver={showPopover}
+        onMouseOut={hidePopover}
     >
         <User.Consumer>
             {states =>
diff --git a/src/components/molecules/AccountStatus/Popover.tsx b/src/components/molecules/AccountStatus/Popover.tsx
index 0d85c17..16fb41b 100644
--- a/src/components/molecules/AccountStatus/Popover.tsx
+++ b/src/components/molecules/AccountStatus/Popover.tsx
@@ -3,8 +3,18 @@ import { User } from '../../../context/User'
 import Faucet from './Faucet'
 import styles from './Popover.module.scss'
 
-const Popover = () => (
-    <div className={styles.popover}>
+const Popover = ({
+    showPopover,
+    hidePopover
+}: {
+    showPopover: any
+    hidePopover: any
+}) => (
+    <div
+        className={styles.popover}
+        onMouseOver={showPopover}
+        onMouseOut={hidePopover}
+    >
         <div className={styles.accountName}>
             <User.Consumer>
                 {states =>
diff --git a/src/components/molecules/AccountStatus/index.tsx b/src/components/molecules/AccountStatus/index.tsx
index 446e265..245b611 100644
--- a/src/components/molecules/AccountStatus/index.tsx
+++ b/src/components/molecules/AccountStatus/index.tsx
@@ -31,13 +31,19 @@ export default class AccountStatus extends PureComponent<
             enterExitTransitionDurationMs: 300,
             tipSize: 0.01,
             onOuterAction: () => this.togglePopover(false),
-            body: <AccountPopover />
+            body: (
+                <AccountPopover
+                    showPopover={() => this.togglePopover(true)}
+                    hidePopover={() => this.togglePopover(false)}
+                />
+            )
         }
 
         return (
             <Popover {...popoverProps}>
                 <AccountIndicator
                     showPopover={() => this.togglePopover(true)}
+                    hidePopover={() => this.togglePopover(false)}
                     className={this.props.className}
                 />
             </Popover>