diff --git a/MasterPassword/ObjC/Mac/MPPasswordWindowController.m b/MasterPassword/ObjC/Mac/MPPasswordWindowController.m
index 7376380c..ade371f4 100644
--- a/MasterPassword/ObjC/Mac/MPPasswordWindowController.m
+++ b/MasterPassword/ObjC/Mac/MPPasswordWindowController.m
@@ -427,15 +427,13 @@
             case NSAlertFirstButtonReturn: {
                 // "Copy Answer" button.
                 [self copyContent:self.securityAnswerField.stringValue];
+                [self.window close];
                 break;
             }
             default:
                 break;
         }
     }];
-    PearlMainQueueAfter(2, ^{
-        [[[alert buttons] firstObject] becomeFirstResponder];
-    });
 }
 
 #pragma mark - Private
@@ -475,7 +473,6 @@
 
     // Performing action while content is available.  Copy it.
     [self copyContent:self.shiftPressed? selectedSite.answer: selectedSite.content];
-
     [self.window close];
 
     NSUserNotification *notification = [NSUserNotification new];
diff --git a/MasterPassword/ObjC/Mac/MPPasswordWindowController.xib b/MasterPassword/ObjC/Mac/MPPasswordWindowController.xib
index 7c2ac14f..cfc91f6a 100644
--- a/MasterPassword/ObjC/Mac/MPPasswordWindowController.xib
+++ b/MasterPassword/ObjC/Mac/MPPasswordWindowController.xib
@@ -432,12 +432,12 @@
                         </connections>
                     </textField>
                     <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lW3-2z-cEa" userLabel="Master Password Tip">
-                        <rect key="frame" x="208" y="255" width="224" height="15"/>
+                        <rect key="frame" x="194.5" y="255" width="251" height="15"/>
                         <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                         </shadow>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Hold alt ⌥ to reveal tips and unmask ●●●●." id="4Ep-xX-Ky8">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Hold alt ⌥ to reveal tips and unmask ●●●●●●●●." id="4Ep-xX-Ky8">
                             <font key="font" size="11" name="HelveticaNeue"/>
                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -459,12 +459,12 @@
                         </connections>
                     </textField>
                     <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Oy5-B7-hdN" userLabel="Revealed Master Password Tip">
-                        <rect key="frame" x="206" y="255" width="227" height="15"/>
+                        <rect key="frame" x="194.5" y="255" width="250" height="15"/>
                         <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                         </shadow>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Hold alt ⌥ to reveal tips and unmask passw." id="bQ4-AN-S1A">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Hold alt ⌥ to reveal tips and unmask passwords." id="bQ4-AN-S1A">
                             <font key="font" size="11" name="HelveticaNeue"/>
                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -624,7 +624,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                                         </connections>
                                     </textField>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="brI-fg-Kav">
-                                        <rect key="frame" x="40" y="111" width="96" height="19"/>
+                                        <rect key="frame" x="40.5" y="111" width="96" height="19"/>
                                         <shadow key="shadow">
                                             <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                                         </shadow>
@@ -679,7 +679,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                                         </connections>
                                     </button>
                                     <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Bgn-Ne-fQ7" userLabel="Version Container">
-                                        <rect key="frame" x="70" y="56" width="36" height="22"/>
+                                        <rect key="frame" x="70.5" y="56" width="36" height="22"/>
                                         <subviews>
                                             <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mcq-qD-yte">
                                                 <rect key="frame" x="-3" y="-3" width="19" height="27"/>
@@ -733,7 +733,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                                         </connections>
                                     </stackView>
                                     <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6II-KA-cNi" userLabel="Counter Container">
-                                        <rect key="frame" x="74" y="26" width="28" height="22"/>
+                                        <rect key="frame" x="74.5" y="26" width="28" height="22"/>
                                         <subviews>
                                             <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XgA-Vl-CKh" userLabel="Counter Stepper">
                                                 <rect key="frame" x="-3" y="-3" width="19" height="27"/>
@@ -746,7 +746,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                                                 </connections>
                                             </stepper>
                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="NvO-kt-eZ2" userLabel="Counter Field">
-                                                <rect key="frame" x="19" y="1" width="11" height="19"/>
+                                                <rect key="frame" x="19" y="1.5" width="11" height="19"/>
                                                 <shadow key="shadow" blurRadius="0.5">
                                                     <size key="offset" width="0.0" height="1"/>
                                                     <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
@@ -879,7 +879,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                         </customSpacing>
                     </stackView>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="luC-0j-BeV">
-                        <rect key="frame" x="147" y="50" width="103" height="14"/>
+                        <rect key="frame" x="147.5" y="50" width="103" height="14"/>
                         <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
@@ -916,7 +916,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gjx-bt-fKM">
-                        <rect key="frame" x="146" y="80" width="100" height="14"/>
+                        <rect key="frame" x="146.5" y="80" width="100" height="14"/>
                         <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
@@ -953,7 +953,7 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dbM-ja-dKO" userLabel="Version Tip">
-                        <rect key="frame" x="100" y="106" width="332" height="14"/>
+                        <rect key="frame" x="100.5" y="106" width="332" height="14"/>
                         <shadow key="shadow" blurRadius="0.5">
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
@@ -1232,13 +1232,12 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
             </view>
             <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
             <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-            <font key="titleFont" metaFont="message" size="11"/>
             <point key="canvasLocation" x="333" y="125"/>
         </box>
         <box autoresizesSubviews="NO" title="Answer to security questions for apple.com:" borderType="line" id="hi3-SX-Td3">
             <rect key="frame" x="0.0" y="0.0" width="416" height="180"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-            <view key="contentView" id="8Ep-zH-Nzv">
+            <view key="contentView" wantsLayer="YES" id="8Ep-zH-Nzv">
                 <rect key="frame" x="1" y="1" width="414" height="164"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
@@ -1248,8 +1247,8 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                             <size key="offset" width="0.0" height="1"/>
                             <color key="color" name="controlLightHighlightColor" catalog="System" colorSpace="catalog"/>
                         </shadow>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" state="on" focusRingType="none" alignment="center" placeholderString="All Questions (click to enter a question keyword):" usesSingleLineMode="YES" id="TUZ-X4-61A">
-                            <font key="font" metaFont="controlContent"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" state="on" focusRingType="none" alignment="center" placeholderString="Enter a keyword for a question-specific answer (eg. &quot;mother&quot;)" usesSingleLineMode="YES" id="TUZ-X4-61A">
+                            <font key="font" metaFont="cellTitle"/>
                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                             <allowedInputSourceLocales>
@@ -1257,16 +1256,19 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
                             </allowedInputSourceLocales>
                         </textFieldCell>
                         <connections>
-                            <binding destination="mcS-ik-b0n" name="value" keyPath="selection.question" id="hAN-q1-w37">
+                            <binding destination="mcS-ik-b0n" name="value" keyPath="selection.question" id="oRp-pm-qpA">
                                 <dictionary key="options">
                                     <bool key="NSContinuouslyUpdatesValue" value="YES"/>
+                                    <string key="NSNullPlaceholder">Enter a keyword for a question-specific answer (eg. "mother")</string>
                                 </dictionary>
                             </binding>
-                            <outlet property="delegate" destination="-2" id="iaJ-UQ-AQh"/>
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cp4-2G-8aG" userLabel="Site Answer">
                         <rect key="frame" x="10" y="103" width="394" height="29"/>
+                        <shadow key="shadow">
+                            <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                        </shadow>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="fewc fom pugsuhe xav" placeholderString="" id="oYj-IR-xmw">
                             <font key="font" size="18" name="SourceCodePro-Regular"/>
                             <color key="textColor" name="keyboardFocusIndicatorColor" catalog="System" colorSpace="catalog"/>
@@ -1308,7 +1310,6 @@ Use the arrows ⇅ to navigate the list or esc ⎋ to exit.</string>
             </constraints>
             <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
             <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-            <font key="titleFont" metaFont="message" size="11"/>
             <point key="canvasLocation" x="333" y="491"/>
         </box>
     </objects>