diff --git a/MacPass/MPDocument+Search.m b/MacPass/MPDocument+Search.m
index 2b2cd086..642ed7fe 100644
--- a/MacPass/MPDocument+Search.m
+++ b/MacPass/MPDocument+Search.m
@@ -102,15 +102,15 @@ NSString *const kMPDocumentSearchResultsKey           = @"kMPDocumentSearchResul
     NSAssert([sender isKindOfClass:NSMenuItem.class], @"Internal inconsitency. Did expect NSMenuItem expected, but got %@", [sender class]);
     state = ((NSMenuItem *)sender).state;
     /* Manually toggle the state since the popupbuttoncell doesn't do it like we want it to */
-    state = state == NSOnState ? NSOffState : NSOnState;
+    state = state == NSControlStateValueOn ? NSControlStateValueOff : NSControlStateValueOn;
   }
  
   switch(state) {
-    case NSOffState:
+    case NSControlStateValueOff:
       toggleFlag ^= MPEntrySearchAllCombineableFlags;
       newFlags = isSingleFlag ? MPEntrySearchNone : (self.searchContext.searchFlags & toggleFlag);
       break;
-    case NSOnState:
+    case NSControlStateValueOn:
       if(isSingleFlag ) {
         newFlags = toggleFlag; // This has to be either expired or double passwords
       }