2 files changed, 29 insertions, 5 deletions
diff --git a/ui/app/components/app-header/app-header.component.js b/ui/app/components/app-header/app-header.component.js
index f7d8c8598..14f8b9f30 100644
--- a/ui/app/components/app-header/app-header.component.js
+++ b/ui/app/components/app-header/app-header.component.js
@@ -18,10 +18,12 @@ export default class AppHeader extends PureComponent {
     isUnlocked: PropTypes.bool,
     hideNetworkIndicator: PropTypes.bool,
     disabled: PropTypes.bool,
+    isAccountMenuOpen: PropTypes.bool,
   }
 
   static contextTypes = {
     t: PropTypes.func,
+    metricsEvent: PropTypes.func,
   }
 
   handleNetworkIndicatorClick (event) {
@@ -30,20 +32,40 @@ export default class AppHeader extends PureComponent {
 
     const { networkDropdownOpen, showNetworkDropdown, hideNetworkDropdown } = this.props
 
-    return networkDropdownOpen === false
-      ? showNetworkDropdown()
-      : hideNetworkDropdown()
+    if (networkDropdownOpen === false) {
+      this.context.metricsEvent({
+        eventOpts: {
+          category: 'Navigation',
+          action: 'Home',
+          name: 'Opened Network Menu',
+        },
+      })
+      showNetworkDropdown()
+    } else {
+      hideNetworkDropdown()
+    }
   }
 
   renderAccountMenu () {
-    const { isUnlocked, toggleAccountMenu, selectedAddress, disabled } = this.props
+    const { isUnlocked, toggleAccountMenu, selectedAddress, disabled, isAccountMenuOpen } = this.props
 
     return isUnlocked && (
       <div
         className={classnames('account-menu__icon', {
           'account-menu__icon--disabled': disabled,
         })}
-        onClick={() => disabled || toggleAccountMenu()}
+        onClick={() => {
+          if (!disabled) {
+            !isAccountMenuOpen && this.context.metricsEvent({
+              eventOpts: {
+                category: 'Navigation',
+                action: 'Home',
+                name: 'Opened Main Menu',
+              },
+            })
+            toggleAccountMenu()
+          }
+        }}
       >
         <Identicon
           address={selectedAddress}
diff --git a/ui/app/components/app-header/app-header.container.js b/ui/app/components/app-header/app-header.container.js
index 30d3f8cc4..1abc2afeb 100644
--- a/ui/app/components/app-header/app-header.container.js
+++ b/ui/app/components/app-header/app-header.container.js
@@ -13,6 +13,7 @@ const mapStateToProps = state => {
     provider,
     selectedAddress,
     isUnlocked,
+    isAccountMenuOpen,
   } = metamask
 
   return {
@@ -21,6 +22,7 @@ const mapStateToProps = state => {
     provider,
     selectedAddress,
     isUnlocked,
+    isAccountMenuOpen,
   }
 }