Make sure the text field is visible before focus

AppKit/CPTextField.j

@@ -513,6 +513,9 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 */
 - (void)_becomeFirstKeyResponder
 {
+    // Make sure the text field is visible so the browser will not scroll without the NSScrollView knowing about it.
+    [self scrollRectToVisible:[self bounds]];
+
     [self setThemeState:CPThemeStateEditing];
 
     [self _updatePlaceholderState];

AppKit/CPTokenField.j

@@ -320,6 +320,8 @@ var CPScrollDestinationNone             = 0,
     // As long as we are the first responder we need to monitor the key status of our window.
     [self _setObserveWindowKeyNotifications:YES];
 
+    [self scrollRectToVisible:[self bounds]];
+
     if ([[self window] isKeyWindow])
         [self _becomeFirstKeyResponder];
 
@@ -361,16 +363,19 @@ var CPScrollDestinationNone             = 0,
     element.style.width = CGRectGetWidth(contentRect) + "px";
     element.style.height = [font defaultLineHeightForFont] + "px";
 
-    [_tokenScrollView documentView]._DOMElement.appendChild(element);
-
     window.setTimeout(function()
     {
-        element.focus();
-        CPTokenFieldInputOwner = self;
-    }, 0.0);
+        [_tokenScrollView documentView]._DOMElement.appendChild(element);
 
-    //post CPControlTextDidBeginEditingNotification
-    [self textDidBeginEditing:[CPNotification notificationWithName:CPControlTextDidBeginEditingNotification object:self userInfo:nil]];
+        //post CPControlTextDidBeginEditingNotification
+        [self textDidBeginEditing:[CPNotification notificationWithName:CPControlTextDidBeginEditingNotification object:self userInfo:nil]];
+
+        window.setTimeout(function()
+        {
+            element.focus();
+            CPTokenFieldInputOwner = self;
+        }, 0.0);
+    }, 0.0);
 
     [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];