diff --git a/Tests/Manual/CPTextFieldHeightTest/AppController.j b/Tests/Manual/CPTextFieldHeightTest/AppController.j
index 8581f1181..c508ae37d 100644
--- a/Tests/Manual/CPTextFieldHeightTest/AppController.j
+++ b/Tests/Manual/CPTextFieldHeightTest/AppController.j
@@ -19,38 +19,49 @@ CPLogRegister(CPLogConsole);
 {
     [theWindow setFrameOrigin:CGPointMake(30, 20)];
 
-    var newWindow = [[CPWindow alloc] initWithContentRect:CGRectMake(400, 40, 400, 400) styleMask:CPTitledWindowMask];
+    var newWindow = [[CPWindow alloc] initWithContentRect:CGRectMake(400, 46, 400, 348) styleMask:CPTitledWindowMask];
 
     [newWindow setTitle:@"sizeToFit"];
 
-    var label = [[OldTextField alloc] initWithFrame:CGRectMake(15, 15, 200, 10)];
+    var label = [[OldTextField alloc] initWithFrame:CGRectMake(15, 15, 300, 10)];
 
     [label setLineBreakMode:CPLineBreakByWordWrapping];
     [label setStringValue:@"Old sizeToFit, CPLineBreakByWordWrapping:\nIgnores original width, does not wrap onto several lines, as you can see by this text that does not wrap."];
     [label sizeToFit];
     [[newWindow contentView] addSubview:label];
 
-    label = [[CPTextField alloc] initWithFrame:CGRectMake(15, 70, 200, 10)];
+    label = [[CPTextField alloc] initWithFrame:CGRectMake(15, 60, 300, 10)];
 
     [label setLineBreakMode:CPLineBreakByWordWrapping];
     [label setStringValue:@"New sizeToFit, CPLineBreakByWordWrapping:\nWraps onto several lines, keeping the original width, as you can see by this text that has wrapped."];
     [label sizeToFit];
     [[newWindow contentView] addSubview:label];
 
-    label = [[OldTextField alloc] initWithFrame:CGRectMake(15, 180, 200, 10)];
+    label = [[OldTextField alloc] initWithFrame:CGRectMake(15, 130, 300, 10)];
 
     [label setLineBreakMode:CPLineBreakByClipping];
     [label setStringValue:@"Old sizeToFit, CPLineBreakByClipping:\nDoes not wrap, as you can see by this text that does not wrap."];
     [label sizeToFit];
     [[newWindow contentView] addSubview:label];
 
-    label = [[CPTextField alloc] initWithFrame:CGRectMake(15, 225, 200, 10)];
+    label = [[CPTextField alloc] initWithFrame:CGRectMake(15, 175, 300, 10)];
 
     [label setLineBreakMode:CPLineBreakByClipping];
     [label setStringValue:@"New sizeToFit, CPLineBreakByClipping:\nDoes not wrap, as you can see by this text that does not wrap."];
     [label sizeToFit];
     [[newWindow contentView] addSubview:label];
 
+    label = [[CPTextField alloc] initWithFrame:CGRectMake(15, 235, 300, 10)];
+
+    [label setLineBreakMode:CPLineBreakByWordWrapping];
+    [label setStringValue:@"New sizeToFit, CPLineBreakByWordWrapping:\nWraps onto several lines, keeping the original width, as you can see by this text that has wrapped."];
+    [label setBezeled:YES];
+    [label setBezelStyle:CPTextFieldSquareBezel];
+    [label setBordered:YES];
+    [label setEditable:YES];
+    [label sizeToFit];
+    [[newWindow contentView] addSubview:label];
+
     [newWindow orderFront:nil];
 }
 
@@ -60,7 +71,6 @@ CPLogRegister(CPLogConsole);
 
 - (void)sizeToFit
 {
-    console.log("old");
     var size = [([self stringValue] || " ") sizeWithFont:[self currentValueForThemeAttribute:@"font"]],
         contentInset = [self currentValueForThemeAttribute:@"content-inset"],
         minSize = [self currentValueForThemeAttribute:@"min-size"],
@@ -128,4 +138,49 @@ var CPTextFieldIsEditableKey            = "CPTextFieldIsEditableKey",
     return self;
 }
 
+- (CGSize)_minimumFrameSize
+{
+    var frameSize = [self frameSize],
+        contentInset = [self currentValueForThemeAttribute:@"content-inset"],
+        minSize = [self currentValueForThemeAttribute:@"min-size"],
+        maxSize = [self currentValueForThemeAttribute:@"max-size"],
+        lineBreakMode = [self lineBreakMode],
+        text = ([self stringValue] || @" "),
+        textSize = CGSizeMakeCopy(frameSize),
+        font = [self currentValueForThemeAttribute:@"font"];
+
+    textSize.width -= contentInset.left + contentInset.right;
+    textSize.height -= contentInset.top + contentInset.bottom;
+
+    if (frameSize.width !== 0 &&
+        (lineBreakMode === CPLineBreakByWordWrapping || lineBreakMode === CPLineBreakByCharWrapping))
+    {
+        textSize = [text sizeWithFont:font inWidth:textSize.width];
+    }
+    else
+        textSize = [text sizeWithFont:font];
+
+    frameSize.height = textSize.height + contentInset.top + contentInset.bottom;
+
+    if ([self isBezeled])
+    {
+        frameSize.height = MAX(frameSize.height, minSize.height);
+
+        if (lineBreakMode !== CPLineBreakByWordWrapping && lineBreakMode !== CPLineBreakByCharWrapping)
+        {
+            if (maxSize.width > 0.0)
+                frameSize.width = MIN(frameSize.width, maxSize.width);
+
+            if (maxSize.height > 0.0)
+                frameSize.height = MIN(frameSize.height, maxSize.height);
+        }
+    }
+    else
+        frameSize.width = textSize.width + contentInset.left + contentInset.right;
+
+    frameSize.width = MAX(frameSize.width, minSize.width);
+
+    return frameSize;
+}
+
 @end