diff --git a/MacPass/MPToolbarDelegate.m b/MacPass/MPToolbarDelegate.m
index 71a3890d..25d6a99d 100644
--- a/MacPass/MPToolbarDelegate.m
+++ b/MacPass/MPToolbarDelegate.m
@@ -292,9 +292,9 @@ NSString *const MPToolbarItemCopyPassword = @"TOOLBAR_COPY_PASSWORD";
     _didShowToolbarForSearch = YES;
     self.toolbar.visible = YES;
   }
-  _displayModeBeforeSearch = [self.toolbar displayMode];
+  _displayModeBeforeSearch = self.toolbar.displayMode;
   if(_displayModeBeforeSearch == NSToolbarDisplayModeLabelOnly) {
-    [self.toolbar setDisplayMode:NSToolbarDisplayModeIconAndLabel];
+    self.toolbar.displayMode = NSToolbarDisplayModeIconAndLabel;
   }
   /* only make the searchfield first responder if it's not already in an active search */
   if(![self.searchField currentEditor]) {