diff --git a/AppKit/CPTextField.j b/AppKit/CPTextField.j
index 07d52f7dd..93b77e769 100644
--- a/AppKit/CPTextField.j
+++ b/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];