diff --git a/PaymentKit/PTKView.m b/PaymentKit/PTKView.m
index d3c06ae..c6aef11 100644
--- a/PaymentKit/PTKView.m
+++ b/PaymentKit/PTKView.m
@@ -19,6 +19,8 @@
 #define kPTKViewCardExpiryFieldEndX 84
 #define kPTKViewCardCVCFieldEndX 177
 
+#define kPTKViewDefaultSize CGSizeMake(290, 46)
+
 static NSString *const kPTKLocalizedStringsTableName = @"PaymentKit";
 static NSString *const kPTKOldLocalizedStringsTableName = @"STPaymentLocalizable";
 
@@ -79,7 +81,7 @@ - (void)setup
     _isInitialState = YES;
     _isValidState = NO;
 
-    self.frame = CGRectMake(self.frame.origin.x, self.frame.origin.y, 290, 46);
+    self.frame = CGRectMake(self.frame.origin.x, self.frame.origin.y, kPTKViewDefaultSize.width, kPTKViewDefaultSize.height);
     self.backgroundColor = [UIColor clearColor];
 
     UIImageView *backgroundImageView = [[UIImageView alloc] initWithFrame:self.bounds];
@@ -230,9 +232,8 @@ - (void)stateCardNumber
                              [self.cardExpiryField removeFromSuperview];
                              [self.cardCVCField removeFromSuperview];
                          }];
+        [self.cardNumberField becomeFirstResponder];
     }
-
-    [self.cardNumberField becomeFirstResponder];
 }
 
 - (void)stateMeta
@@ -604,4 +605,12 @@ - (BOOL)resignFirstResponder;
     return [self.firstResponderField resignFirstResponder];
 }
 
+#pragma mark -
+#pragma mark UIView
+
+- (CGSize)intrinsicContentSize
+{
+    return kPTKViewDefaultSize;
+}
+
 @end