diff --git a/components/Chips/src/MDCChipField.m b/components/Chips/src/MDCChipField.m
index 2886262efc7..ea70f96b7dd 100644
--- a/components/Chips/src/MDCChipField.m
+++ b/components/Chips/src/MDCChipField.m
@@ -734,7 +734,7 @@ - (CGFloat)availableWidthForTextInput {
   }
 
   CGRect lastChipFrame = [chipFrames.lastObject CGRectValue];
-  return boundsWidth - CGRectGetMaxX(lastChipFrame);
+  return boundsWidth - CGRectGetMaxX(lastChipFrame) - self.contentEdgeInsets.right;
 }
 
 // The width of the text input + the clear button.
diff --git a/snapshot_test_goldens/goldens_64/MDCChipFieldSnapshotTests/testTextFieldIsOnLineBelowWideChips_11_2@2x.png b/snapshot_test_goldens/goldens_64/MDCChipFieldSnapshotTests/testTextFieldIsOnLineBelowWideChips_11_2@2x.png
index 664c61c8637..56c0d97ba3d 100644
--- a/snapshot_test_goldens/goldens_64/MDCChipFieldSnapshotTests/testTextFieldIsOnLineBelowWideChips_11_2@2x.png
+++ b/snapshot_test_goldens/goldens_64/MDCChipFieldSnapshotTests/testTextFieldIsOnLineBelowWideChips_11_2@2x.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e3e081674ef0be7a591f8fbbf45a8f7484a6dcfca4ae365cf7e197e34b156c7b
-size 26081
+oid sha256:a88f0d51cc7ba9ed2aea3ea51e8a06dfac55329701b6337122ca13cb18d765e0
+size 26427
diff --git a/snapshot_test_goldens/goldens_64/MDCChipFieldSnapshotTests/testTextFieldIsOnTheSameLineAsNarrowChips_11_2@2x.png b/snapshot_test_goldens/goldens_64/MDCChipFieldSnapshotTests/testTextFieldIsOnTheSameLineAsNarrowChips_11_2@2x.png
index d1be78a885a..028d1680d6a 100644
--- a/snapshot_test_goldens/goldens_64/MDCChipFieldSnapshotTests/testTextFieldIsOnTheSameLineAsNarrowChips_11_2@2x.png
+++ b/snapshot_test_goldens/goldens_64/MDCChipFieldSnapshotTests/testTextFieldIsOnTheSameLineAsNarrowChips_11_2@2x.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4d34c24525d06510d6eb63b2f3ee56277e80ac20e2eb88583fbd8bbf19e83b5f
-size 5881
+oid sha256:b65a6b0c371f202f51c28206c50b101c8dda503c37a5d59df59458e38218a880
+size 6227
diff --git a/snapshot_test_goldens/goldens_64/MDCChipFieldSnapshotTests/testTextFieldWithZeroMinimumWidthIsOnSameLineAsWideChips_11_2@2x.png b/snapshot_test_goldens/goldens_64/MDCChipFieldSnapshotTests/testTextFieldWithZeroMinimumWidthIsOnSameLineAsWideChips_11_2@2x.png
index 664c61c8637..56c0d97ba3d 100644
--- a/snapshot_test_goldens/goldens_64/MDCChipFieldSnapshotTests/testTextFieldWithZeroMinimumWidthIsOnSameLineAsWideChips_11_2@2x.png
+++ b/snapshot_test_goldens/goldens_64/MDCChipFieldSnapshotTests/testTextFieldWithZeroMinimumWidthIsOnSameLineAsWideChips_11_2@2x.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e3e081674ef0be7a591f8fbbf45a8f7484a6dcfca4ae365cf7e197e34b156c7b
-size 26081
+oid sha256:a88f0d51cc7ba9ed2aea3ea51e8a06dfac55329701b6337122ca13cb18d765e0
+size 26427