diff --git a/src/components/TextField/TextField.scss b/src/components/TextField/TextField.scss
index ea1901df1f9..b8a3aad8fe2 100644
--- a/src/components/TextField/TextField.scss
+++ b/src/components/TextField/TextField.scss
@@ -181,9 +181,9 @@ $stacking-order: (
   color: color('red');
 }
 
-.FlexEnd {
+.AlignFieldBottom {
   align-self: flex-end;
-  margin-bottom: rem(4px);
+  margin-bottom: spacing(extra-tight);
 }
 
 .Spinner {
diff --git a/src/components/TextField/TextField.tsx b/src/components/TextField/TextField.tsx
index e53cf60871c..c95b04cdd65 100644
--- a/src/components/TextField/TextField.tsx
+++ b/src/components/TextField/TextField.tsx
@@ -222,8 +222,7 @@ class TextField extends React.PureComponent<CombinedProps, State> {
 
     const characterCountClassName = classNames(
       styles.CharacterCount,
-      multiline && styles.FlexEnd,
-      // maxLength && characterCount === 0 && styles.MaxCharacters,
+      multiline && styles.AlignFieldBottom,
     );
 
     const characterCountText = !maxLength