diff --git a/ui/app/actions.js b/ui/app/actions.js
index bd3aab45a..55773b3b5 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -925,9 +925,13 @@ function lockMetamask () {
       })
       .then(newState => {
         dispatch(actions.updateMetamaskState(newState))
+        dispatch(actions.hideLoadingIndication())
+        dispatch({ type: actions.LOCK_METAMASK })
+      })
+      .catch(() => {
+        dispatch(actions.hideLoadingIndication())
         dispatch({ type: actions.LOCK_METAMASK })
       })
-      .catch(() => dispatch({ type: actions.LOCK_METAMASK }))
   }
 }
 
diff --git a/ui/app/components/account-menu/index.js b/ui/app/components/account-menu/index.js
index 286a3b587..1b62b42fb 100644
--- a/ui/app/components/account-menu/index.js
+++ b/ui/app/components/account-menu/index.js
@@ -33,7 +33,7 @@ function mapDispatchToProps (dispatch) {
     },
     lockMetamask: () => {
       dispatch(actions.lockMetamask())
-      dispatch(actions.displayWarning(null))
+      dispatch(actions.hideWarning())
       dispatch(actions.hideSidebar())
       dispatch(actions.toggleAccountMenu())
     },