diff --git a/MacPass/Base.lproj/DatabaseSettingsWindow.xib b/MacPass/Base.lproj/DatabaseSettingsWindow.xib
index 7249b438..11b02caa 100644
--- a/MacPass/Base.lproj/DatabaseSettingsWindow.xib
+++ b/MacPass/Base.lproj/DatabaseSettingsWindow.xib
@@ -58,7 +58,7 @@
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="288">
-                        <rect key="frame" x="492" y="13" width="54" height="32"/>
+                        <rect key="frame" x="433" y="13" width="54" height="32"/>
                         <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="289">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -71,7 +71,7 @@ DQ
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="956">
-                        <rect key="frame" x="418" y="13" width="76" height="32"/>
+                        <rect key="frame" x="359" y="13" width="76" height="32"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="957">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -84,7 +84,7 @@ Gw
                         </connections>
                     </button>
                     <tabView translatesAutoresizingMaskIntoConstraints="NO" id="357">
-                        <rect key="frame" x="13" y="40" width="533" height="439"/>
+                        <rect key="frame" x="13" y="40" width="474" height="310"/>
                         <font key="font" metaFont="system"/>
                         <tabViewItems>
                             <tabViewItem label="General" identifier="1" id="358">
diff --git a/MacPass/Base.lproj/GroupInspectorView.xib b/MacPass/Base.lproj/GroupInspectorView.xib
index 11016187..010f75fe 100644
--- a/MacPass/Base.lproj/GroupInspectorView.xib
+++ b/MacPass/Base.lproj/GroupInspectorView.xib
@@ -14,6 +14,7 @@
                 <outlet property="expireDateSelectButton" destination="4" id="W6H-j5-GLf"/>
                 <outlet property="expiresCheckButton" destination="5" id="283"/>
                 <outlet property="searchPopupButton" destination="229" id="284"/>
+                <outlet property="tagsTokenField" destination="5ty-ww-t4q" id="MD7-yb-kgI"/>
                 <outlet property="titleTextField" destination="23" id="35"/>
                 <outlet property="view" destination="37" id="45"/>
             </connections>
diff --git a/MacPass/MPGroupInspectorViewController.h b/MacPass/MPGroupInspectorViewController.h
index 734ba595..6b41904c 100644
--- a/MacPass/MPGroupInspectorViewController.h
+++ b/MacPass/MPGroupInspectorViewController.h
@@ -27,14 +27,15 @@
 @interface MPGroupInspectorViewController : MPViewController
 
 @property (strong) IBOutlet NSView *contentView;
-@property (weak) IBOutlet HNHUITextField *titleTextField;
+@property (strong) IBOutlet HNHUITextField *titleTextField;
 
-@property (weak) IBOutlet NSButton *expiresCheckButton;
-@property (weak) IBOutlet NSButton *expireDateSelectButton;
+@property (strong) IBOutlet NSButton *expiresCheckButton;
+@property (strong) IBOutlet NSButton *expireDateSelectButton;
 
-@property (weak) IBOutlet NSPopUpButton *searchPopupButton;
-@property (weak) IBOutlet NSPopUpButton *autotypePopupButton;
-@property (weak) IBOutlet HNHUITextField *autotypeSequenceTextField;
+@property (strong) IBOutlet NSPopUpButton *searchPopupButton;
+@property (strong) IBOutlet NSPopUpButton *autotypePopupButton;
+@property (strong) IBOutlet HNHUITextField *autotypeSequenceTextField;
+@property (strong) IBOutlet NSTokenField *tagsTokenField;
 
 - (void)registerNotificationsForDocument:(MPDocument *)document;
 @end
diff --git a/MacPass/MPGroupInspectorViewController.m b/MacPass/MPGroupInspectorViewController.m
index ed13bccd..ed6c61d7 100644
--- a/MacPass/MPGroupInspectorViewController.m
+++ b/MacPass/MPGroupInspectorViewController.m
@@ -127,6 +127,10 @@
                       toObject:self
                    withKeyPath:[NSString stringWithFormat:@"%@.%@", NSStringFromSelector(@selector(representedObject)), NSStringFromSelector(@selector(isSearchEnabled))]
                        options:nil];
+  [self.tagsTokenField bind:NSValueBinding
+                   toObject:self
+                withKeyPath:[NSString stringWithFormat:@"%@.%@", NSStringFromSelector(@selector(representedObject)), NSStringFromSelector(@selector(tags))]
+                    options:nullPlaceholderOptionsDict];
 }
 - (IBAction)toggleExpire:(NSButton*)sender {
   KPKGroup *group = self.representedObject;