2 files changed, 29 insertions, 2 deletions
diff --git a/test/integration/lib/first-time.js b/test/integration/lib/first-time.js
index 76b10f568..d2fe31878 100644
--- a/test/integration/lib/first-time.js
+++ b/test/integration/lib/first-time.js
@@ -56,7 +56,33 @@ QUnit.test('agree to terms', function (assert) {
 
     var detail = app.find('.account-detail-section')[0]
     assert.ok(detail, 'Account detail section loaded.')
-    done()
 
+    var sandwich = app.find('.sandwich-expando')[0]
+    sandwich.click()
+
+    return wait()
+  }).then(function() {
+
+    var sandwich = app.find('.menu-droppo')[0]
+    var lock = sandwich.children[2]
+    assert.ok(lock, 'Lock menu item found')
+    lock.click()
+
+    return wait(1000)
+  }).then(function() {
+
+    var pwBox = app.find('#password-box')[0]
+    pwBox.value = PASSWORD
+
+    var createButton = app.find('button.primary')[0]
+    createButton.click()
+
+    return wait(1500)
+  }).then(function() {
+
+    var detail = app.find('.account-detail-section')[0]
+    assert.ok(detail, 'Account detail section loaded again.')
+
+    done()
   })
 })
diff --git a/ui/app/actions.js b/ui/app/actions.js
index d800091f2..0cc55136f 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -447,11 +447,12 @@ function updateMetamaskState (newState) {
 
 function lockMetamask () {
   return (dispatch) => {
-    background.setLocked((err) => {
+    background.setLocked((err, newState) => {
       dispatch(actions.hideLoadingIndication())
       if (err) {
         return dispatch(actions.displayWarning(err.message))
       }
+      dispatch(actions.updateMetamaskState(newState))
     })
   }
 }