diff --git a/lib/java/com/google/android/material/textfield/TextInputEditText.java b/lib/java/com/google/android/material/textfield/TextInputEditText.java
index e20c8eb7e7b..3827b7dcdd3 100644
--- a/lib/java/com/google/android/material/textfield/TextInputEditText.java
+++ b/lib/java/com/google/android/material/textfield/TextInputEditText.java
@@ -152,13 +152,15 @@ public boolean isTextInputLayoutFocusedRectEnabled() {
     return textInputLayoutFocusedRectEnabled;
   }
 
+  private boolean shouldUseTextInputLayoutFocusedRect(@Nullable TextInputLayout textInputLayout) {
+    return textInputLayout != null && textInputLayoutFocusedRectEnabled;
+  }
+
   @Override
   public void getFocusedRect(@Nullable Rect r) {
     super.getFocusedRect(r);
     TextInputLayout textInputLayout = getTextInputLayout();
-    if (textInputLayout != null
-        && textInputLayoutFocusedRectEnabled
-        && r != null) {
+    if (shouldUseTextInputLayoutFocusedRect(textInputLayout) && r != null) {
       textInputLayout.getFocusedRect(parentRect);
       r.bottom = parentRect.bottom;
     }
@@ -166,31 +168,26 @@ public void getFocusedRect(@Nullable Rect r) {
 
   @Override
   public boolean getGlobalVisibleRect(@Nullable Rect r, @Nullable Point globalOffset) {
-    boolean result = super.getGlobalVisibleRect(r, globalOffset);
     TextInputLayout textInputLayout = getTextInputLayout();
-    if (textInputLayout != null
-        && textInputLayoutFocusedRectEnabled
-        && r != null) {
-      textInputLayout.getGlobalVisibleRect(parentRect, globalOffset);
-      r.bottom = parentRect.bottom;
-    }
-    return result;
+    return shouldUseTextInputLayoutFocusedRect(textInputLayout)
+        ? textInputLayout.getGlobalVisibleRect(r, globalOffset)
+        : super.getGlobalVisibleRect(r, globalOffset);
   }
 
   @Override
   public boolean requestRectangleOnScreen(@Nullable Rect rectangle) {
-    boolean result = super.requestRectangleOnScreen(rectangle);
     TextInputLayout textInputLayout = getTextInputLayout();
-    if (textInputLayout != null && textInputLayoutFocusedRectEnabled) {
+    if (shouldUseTextInputLayoutFocusedRect(textInputLayout) && rectangle != null) {
+      int bottomOffset = textInputLayout.getHeight() - getHeight();
       parentRect.set(
-          0,
-          textInputLayout.getHeight()
-              - getResources().getDimensionPixelOffset(R.dimen.mtrl_edittext_rectangle_top_offset),
-          textInputLayout.getWidth(),
-          textInputLayout.getHeight());
-      textInputLayout.requestRectangleOnScreen(parentRect, true);
+          rectangle.left,
+          rectangle.top,
+          rectangle.right,
+          rectangle.bottom + bottomOffset);
+      return super.requestRectangleOnScreen(parentRect);
+    } else {
+      return super.requestRectangleOnScreen(rectangle);
     }
-     return result;
   }
 
   @Override
diff --git a/lib/java/com/google/android/material/textfield/res/values/dimens.xml b/lib/java/com/google/android/material/textfield/res/values/dimens.xml
index fdfc3f51f81..fd90094d77f 100644
--- a/lib/java/com/google/android/material/textfield/res/values/dimens.xml
+++ b/lib/java/com/google/android/material/textfield/res/values/dimens.xml
@@ -34,8 +34,6 @@
   <dimen name="mtrl_textinput_box_stroke_width_focused">2dp</dimen>
   <dimen name="mtrl_textinput_box_label_cutout_padding">4dp</dimen>
 
-  <dimen name="mtrl_edittext_rectangle_top_offset">12dp</dimen>
-
   <!-- Dimens for edit text's top and bottom padding adjustments for large font scale settings. -->
   <dimen name="material_filled_edittext_font_1_3_padding_top">23dp</dimen>
   <dimen name="material_filled_edittext_font_1_3_padding_bottom">12dp</dimen>