diff --git a/MacPass/MPDocumentWindowController.m b/MacPass/MPDocumentWindowController.m
index cd7c49e5..26aa9f36 100644
--- a/MacPass/MPDocumentWindowController.m
+++ b/MacPass/MPDocumentWindowController.m
@@ -181,11 +181,13 @@ NSString *const MPCurrentItemChangedNotification = @"com.hicknhack.macpass.MPCur
 }
 
 - (BOOL)validateToolbarItem:(NSToolbarItem *)theItem {
+  MPDocument *document = [self document];
+  if(document.isLocked) {
+    return NO;
+  }
   SEL itemAction = [theItem action];
   if( itemAction == [MPActionHelper actionOfType:MPActionLock]) {
-    MPDocument *document = [self document];
-    BOOL showsNoLockScreen = (nil == [[_passwordInputController view] superview]);
-    return showsNoLockScreen && document.isSecured;
+    return document.isSecured;
   }
   if(itemAction == [MPActionHelper actionOfType:MPActionAddEntry]) {
     return (nil != _outlineViewController.selectedGroup);
diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist
index 5a4e5f67..484c468c 100644
--- a/MacPass/MacPass-Info.plist
+++ b/MacPass/MacPass-Info.plist
@@ -48,7 +48,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1165</string>
+	<string>1167</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>