diff --git a/field/internal/field.ts b/field/internal/field.ts
index 1413e2e556..efc8bdc6b2 100644
--- a/field/internal/field.ts
+++ b/field/internal/field.ts
@@ -78,7 +78,8 @@ export class Field extends LitElement implements SurfacePositionTarget {
 
   protected override update(props: PropertyValues<Field>) {
     // Client-side property updates
-    const isDisabledChanging = props.has('disabled') && props.get('disabled') !== undefined;
+    const isDisabledChanging =
+        props.has('disabled') && props.get('disabled') !== undefined;
     if (isDisabledChanging) {
       this.disableTransitions = true;
     }
diff --git a/textfield/harness.ts b/textfield/harness.ts
index 34473f924f..2317d60857 100644
--- a/textfield/harness.ts
+++ b/textfield/harness.ts
@@ -75,19 +75,6 @@ export class TextFieldHarness extends Harness<TextField> {
 
     this.valueBeforeChange = textField.value;
     super.simulatePointerFocus(input);
-
-    const prevFocus = input.focus;
-    if (prevFocus === HTMLElement.prototype.focus) {
-      // Swap to a no-op if nobody is spying on this method so that we don't
-      // generate side-effects when we actually call focus().
-      input.focus = () => {};
-    }
-
-    // Call focus() as a side-effect since delegatesFocus won't be triggered
-    // with this simulation. Replace input.focus() with a no-op if needed to
-    // avoid actually calling focus.
-    textField.focus();
-    input.focus = prevFocus;
   }
 
   protected simulateInput(
diff --git a/textfield/internal/text-field.ts b/textfield/internal/text-field.ts
index 0d97811577..07317ce61d 100644
--- a/textfield/internal/text-field.ts
+++ b/textfield/internal/text-field.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {html, isServer, LitElement, nothing, PropertyValues} from 'lit';
+import {html, LitElement, nothing, PropertyValues} from 'lit';
 import {property, query, queryAssignedElements, state} from 'lit/decorators.js';
 import {classMap} from 'lit/directives/class-map.js';
 import {live} from 'lit/directives/live.js';
@@ -350,15 +350,6 @@ export abstract class TextField extends LitElement {
   private readonly internals =
       (this as HTMLElement /* needed for closure */).attachInternals();
 
-  constructor() {
-    super();
-    if (!isServer) {
-      this.addEventListener('click', this.focus);
-      this.addEventListener('focusin', this.handleFocusin);
-      this.addEventListener('focusout', this.handleFocusout);
-    }
-  }
-
   /**
    * Checks the text field's native validation and returns whether or not the
    * element is valid.
@@ -374,19 +365,6 @@ export abstract class TextField extends LitElement {
     return this.internals.checkValidity();
   }
 
-  /**
-   * Focuses the text field's input text.
-   */
-  override focus() {
-    if (this.disabled || this.matches(':focus-within')) {
-      // Don't shift focus from an element within the text field, like an icon
-      // button, to the input when focus is requested.
-      return;
-    }
-
-    super.focus();
-  }
-
   /**
    * Checks the text field's native validation and returns whether or not the
    * element is valid.
@@ -640,6 +618,8 @@ export abstract class TextField extends LitElement {
           rows=${this.rows}
           .value=${live(this.value)}
           @change=${this.handleChange}
+          @focusin=${this.handleFocusin}
+          @focusout=${this.handleFocusout}
           @input=${this.handleInput}
           @select=${this.redispatchEvent}
         ></textarea>
@@ -677,6 +657,8 @@ export abstract class TextField extends LitElement {
           type=${this.type}
           .value=${live(this.value)}
           @change=${this.redispatchEvent}
+          @focusin=${this.handleFocusin}
+          @focusout=${this.handleFocusout}
           @input=${this.handleInput}
           @select=${this.redispatchEvent}
         >
@@ -715,11 +697,6 @@ export abstract class TextField extends LitElement {
   }
 
   private handleFocusout() {
-    if (this.matches(':focus-within')) {
-      // Changing focus to another child within the text field, like a button
-      return;
-    }
-
     this.focused = false;
   }
 
diff --git a/textfield/internal/text-field_test.ts b/textfield/internal/text-field_test.ts
index 9a152e776e..36c4528bc8 100644
--- a/textfield/internal/text-field_test.ts
+++ b/textfield/internal/text-field_test.ts
@@ -73,7 +73,7 @@ describe('TextField', () => {
       expect(input.matches(':focus')).withContext('is input:focus').toBeTrue();
     });
 
-    it('should focus the input when elements inside text field are clicked',
+    it('should NOT focus the input when elements inside text field are clicked',
        async () => {
          const {harness, input} = await setupTest();
          // Add a trailing icon button to click on
@@ -86,12 +86,13 @@ describe('TextField', () => {
 
          expect(input.matches(':focus'))
              .withContext('is input:focus')
-             .toBeTrue();
+             .toBeFalse();
        });
 
     it('should not focus the input when disabled', async () => {
       const {harness, input} = await setupTest();
       harness.element.disabled = true;
+      await env.waitForStability();
 
       harness.element.focus();