diff --git a/MacPass/MPSavePanelAccessoryViewController.m b/MacPass/MPSavePanelAccessoryViewController.m
index 63b7d945..0262f485 100644
--- a/MacPass/MPSavePanelAccessoryViewController.m
+++ b/MacPass/MPSavePanelAccessoryViewController.m
@@ -63,6 +63,11 @@
 }
 
 - (void)updateView {
+  /*
+   Access view at least once to make sure it is properly loaded
+   */
+  NSView *view = [self view];
+  NSAssert(view != nil, @"View has to be loaded at this point");
   switch(self.document.versionForFileType) {
     case KPKLegacyVersion:
       [self.fileTypePopupButton selectItemAtIndex:1];
@@ -74,6 +79,7 @@
       NSAssert(NO, @"Minimum Version should always be valid");
       break;
   }
+  [self setFileType:self.fileTypePopupButton];
   [self _updateNote];
 }
 
diff --git a/MacPass/MPToolbarDelegate.m b/MacPass/MPToolbarDelegate.m
index ac3c4e3c..1ef132a1 100644
--- a/MacPass/MPToolbarDelegate.m
+++ b/MacPass/MPToolbarDelegate.m
@@ -62,6 +62,7 @@ NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR";
       NSPopUpButton *popupButton = [[NSPopUpButton alloc] initWithFrame:NSMakeRect(0, 0, 50, 32) pullsDown:YES];
       [[popupButton cell] setBezelStyle:NSTexturedRoundedBezelStyle];
       [[popupButton cell] setImageScaling:NSImageScaleProportionallyDown];
+      [popupButton setFocusRingType:NSFocusRingTypeNone];
       [popupButton setTitle:@""];
       [popupButton sizeToFit];