diff --git a/MacPass/ContextBar.xib b/MacPass/ContextBar.xib
index 147f72a9..784f8c03 100644
--- a/MacPass/ContextBar.xib
+++ b/MacPass/ContextBar.xib
@@ -7,8 +7,8 @@
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="MPContextBarViewController">
             <connections>
+                <outlet property="duplicatePasswordsButton" destination="hMB-2T-pBD" id="dWH-3p-fy6"/>
                 <outlet property="emptyTrashButton" destination="szx-Hx-OrV" id="i1Y-qB-TW3"/>
-                <outlet property="everywhereButton" destination="hMB-2T-pBD" id="FEh-AQ-zSQ"/>
                 <outlet property="exitHistoryButton" destination="pqx-su-vAh" id="JmV-vC-F48"/>
                 <outlet property="filterLabelTextField" destination="6" id="60"/>
                 <outlet property="historyBar" destination="S8L-rB-h0h" id="6yZ-El-fVs"/>
@@ -103,9 +103,9 @@
                                         </connections>
                                     </button>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hMB-2T-pBD">
-                                        <rect key="frame" x="378" y="6" width="87" height="17"/>
+                                        <rect key="frame" x="378" y="6" width="144" height="17"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                        <buttonCell key="cell" type="recessed" title="Everywhere" bezelStyle="recessed" alignment="center" controlSize="small" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="G1B-En-dc2">
+                                        <buttonCell key="cell" type="recessed" title="Duplicate Passwords" bezelStyle="recessed" alignment="center" controlSize="small" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="G1B-En-dc2">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
                                             <font key="font" metaFont="systemBold" size="12"/>
                                         </buttonCell>
diff --git a/MacPass/MPContextBarViewController.h b/MacPass/MPContextBarViewController.h
index 209d9a64..4eeadb6a 100644
--- a/MacPass/MPContextBarViewController.h
+++ b/MacPass/MPContextBarViewController.h
@@ -19,7 +19,7 @@
 @property (weak) IBOutlet NSButton *passwordButton;
 @property (weak) IBOutlet NSButton *urlButton;
 @property (weak) IBOutlet NSButton *notesButton;
-@property (weak) IBOutlet NSButton *everywhereButton;
+@property (weak) IBOutlet NSButton *duplicatePasswordsButton;
 
 - (void)registerNotificationsForDocument:(MPDocument *)document;
 
diff --git a/MacPass/MPContextBarViewController.m b/MacPass/MPContextBarViewController.m
index 19b0a9a0..b0849b92 100644
--- a/MacPass/MPContextBarViewController.m
+++ b/MacPass/MPContextBarViewController.m
@@ -69,7 +69,7 @@ typedef NS_ENUM(NSUInteger, MPContextTab) {
   self.emptyTrashButton.textColor = [NSColor whiteColor];
   
   NSInteger tags[] = { MPEntrySearchTitles, MPEntrySearchUsernames, MPEntrySearchPasswords, MPEntrySearchNotes, MPEntrySearchUrls, MPEntrySearchDoublePasswords };
-  NSArray *buttons  = @[self.titleButton, self.usernameButton, self.passwordButton, self.notesButton, self.urlButton, self.everywhereButton ];
+  NSArray *buttons  = @[self.titleButton, self.usernameButton, self.passwordButton, self.notesButton, self.urlButton, self.duplicatePasswordsButton ];
   for(NSUInteger iIndex = 0; iIndex < [buttons count]; iIndex++) {
     [buttons[iIndex] setAction:@selector(toggleSearchFlags:)];
     [buttons[iIndex] setTag:tags[iIndex]];
@@ -122,8 +122,7 @@ typedef NS_ENUM(NSUInteger, MPContextTab) {
 
 - (void)_updateFilterButtons {
   MPDocument *document = [[self windowController] document];
-  //[self.everywhereButton setEnabled:NO];
-  [self.everywhereButton setState:HNHStateForBool(MPTestFlagInOptions(MPEntrySearchDoublePasswords, document.activeFlags))];
+  [self.duplicatePasswordsButton setState:HNHStateForBool(MPTestFlagInOptions(MPEntrySearchDoublePasswords, document.activeFlags))];
   [self.notesButton setState:HNHStateForBool(MPTestFlagInOptions(MPEntrySearchNotes, document.activeFlags))];
   [self.passwordButton setState:HNHStateForBool(MPTestFlagInOptions(MPEntrySearchPasswords, document.activeFlags))];
   [self.titleButton setState:HNHStateForBool(MPTestFlagInOptions(MPEntrySearchTitles, document.activeFlags))];