diff --git a/skills/tedi-angular/references/components.md b/skills/tedi-angular/references/components.md
index 157c5476f..4e499dbb6 100644
--- a/skills/tedi-angular/references/components.md
+++ b/skills/tedi-angular/references/components.md
@@ -201,6 +201,23 @@ Both entry points declare `[tedi-floating-button]`. The Community component is
   content. It is decorative and `aria-hidden`, which means the projected text is the whole accessible
   name — if the icon carries meaning the text doesn't, compose a heading and an icon yourself.
 
+### Clear buttons
+
+- **`showClearOnInteraction` belongs on the component that renders the clear button.** For a text
+  field or textarea wrapped in `<tedi-form-field>`, set it on the form field, not the
+  control. `<tedi-search>` owns its form field and exposes the input itself; `<tedi-select>` exposes
+  it for its own clear button. In each case, `clearable` must be true and the field must have a value.
+- With the option enabled, the clear button appears while the field is hovered, active, or contains
+  focus (including keyboard focus). The default is false, which keeps the clear button visible
+  whenever the clearable field has a value.
+
+```html
+<tedi-form-field [clearable]="true" [showClearOnInteraction]="true">
+  <label tedi-label for="query">Query</label>
+  <input tedi-text-field id="query" [(value)]="query" />
+</tedi-form-field>
+```
+
 ### Search suggestions
 
 - **`tedi-search` does not filter.** Bind `suggestions` to a list you have already filtered and react
@@ -233,9 +250,9 @@ Both entry points declare `[tedi-floating-button]`. The Community component is
 - **`tedi-table`, not `tedi-table-styles`.** The Community `tedi-table-styles` only paints a
   hand-rolled `<table>`; the TEDI-Ready `tedi-table` brings TanStack sorting, filtering and
   pagination.
-- **`tedi-form-field` is only needed for a label, feedback text, or a `characterLimit` counter.**
-  Controls paint their own field surface, so wrapping is otherwise redundant. `tedi-search` renders
-  its own and must **not** be wrapped.
+- **`tedi-form-field` adds a label, feedback text, a `characterLimit` counter, an icon, or a clear
+  button to controls that support it.** A standalone text field paints its own surface, so wrapping
+  it is otherwise redundant. `tedi-search` renders its own form field and must **not** be wrapped.
 - **`tedi-heading-with-icon` over a hand-composed `<hN tedi-text>` plus `tedi-icon`** when the heading
   can wrap: it centres the icon on the *first line* rather than the middle of the block. A heading
   value in `modifiers` overrides `element`'s typography and the icon follows it, so
diff --git a/src/tedi/components/form/form-field/form-field.component.scss b/src/tedi/components/form/form-field/form-field.component.scss
index 5016bc255..faa979831 100644
--- a/src/tedi/components/form/form-field/form-field.component.scss
+++ b/src/tedi/components/form/form-field/form-field.component.scss
@@ -74,6 +74,16 @@
     }
   }
 
+  &--clear-on-interaction &__buttons {
+    visibility: hidden;
+  }
+
+  &--clear-on-interaction &__box:hover &__buttons,
+  &--clear-on-interaction &__box:active &__buttons,
+  &--clear-on-interaction &__box:focus-within &__buttons {
+    visibility: visible;
+  }
+
   &__clear:disabled {
     cursor: not-allowed;
   }
diff --git a/src/tedi/components/form/form-field/form-field.component.spec.ts b/src/tedi/components/form/form-field/form-field.component.spec.ts
index 69d89cb73..cb07de527 100644
--- a/src/tedi/components/form/form-field/form-field.component.spec.ts
+++ b/src/tedi/components/form/form-field/form-field.component.spec.ts
@@ -45,6 +45,7 @@ class MockControlComponent implements FormFieldControl<string> {
       [size]="size"
       [icon]="icon"
       [clearable]="clearable"
+      [showClearOnInteraction]="showClearOnInteraction"
       [inputClass]="inputClass"
       [characterLimit]="characterLimit"
     >
@@ -66,6 +67,7 @@ class TestHostComponent {
   size: InputSize = "default";
   icon?: string | FormFieldIcon;
   clearable = false;
+  showClearOnInteraction = false;
   inputClass?: string;
   characterLimit?: number;
   feedbackType: "valid" | "error" | "hint" = "hint";
@@ -174,6 +176,36 @@ describe("FormFieldComponent", () => {
     expect(button.hasAttribute("disabled")).toBe(false);
   });
 
+  it("applies the interaction modifier only to a filled clearable field when opted in", () => {
+    const field = fixture.nativeElement.querySelector("tedi-form-field");
+    host.showClearOnInteraction = true;
+    fixture.detectChanges();
+    expect(
+      field.classList.contains("tedi-form-field--clear-on-interaction"),
+    ).toBe(false);
+
+    host.clearable = true;
+    host.mockControl.value.set("Test");
+    fixture.detectChanges();
+    expect(
+      field.classList.contains("tedi-form-field--clear-on-interaction"),
+    ).toBe(true);
+    expect(field.querySelector(".tedi-form-field__clear")).toBeTruthy();
+
+    host.mockControl.value.set("");
+    fixture.detectChanges();
+    expect(
+      field.classList.contains("tedi-form-field--clear-on-interaction"),
+    ).toBe(false);
+
+    host.mockControl.value.set("Test");
+    host.showClearOnInteraction = false;
+    fixture.detectChanges();
+    expect(
+      field.classList.contains("tedi-form-field--clear-on-interaction"),
+    ).toBe(false);
+  });
+
   it("should not render buttons slot when clearable is false", () => {
     host.clearable = false;
     host.mockControl.value.set("Test");
diff --git a/src/tedi/components/form/form-field/form-field.component.ts b/src/tedi/components/form/form-field/form-field.component.ts
index 1d69e5f83..ed4422635 100644
--- a/src/tedi/components/form/form-field/form-field.component.ts
+++ b/src/tedi/components/form/form-field/form-field.component.ts
@@ -87,6 +87,12 @@ export class FormFieldComponent implements FieldContext {
    * @default false
    */
   clearable = input<boolean>(false);
+  /**
+   * Show the clear button only while the filled field is hovered or focused.
+   * Requires `clearable`.
+   * @default false
+   */
+  showClearOnInteraction = input<boolean>(false);
   /**
    * Custom CSS classes for the field box.
    *
@@ -232,6 +238,8 @@ export class FormFieldComponent implements FieldContext {
       "tedi-form-field--valid": this.validationState() === "valid",
       "tedi-form-field--invalid": this.validationState() === "invalid",
       "tedi-form-field--disabled": this.isDisabled(),
+      "tedi-form-field--clear-on-interaction":
+        this.showClearOnInteraction() && this.showClearButton(),
       "tedi-form-field--small": this.size() === "small",
       "tedi-form-field--large": this.size() === "large",
     };
diff --git a/src/tedi/components/form/search/search.component.html b/src/tedi/components/form/search/search.component.html
index c322548cf..906f520fb 100644
--- a/src/tedi/components/form/search/search.component.html
+++ b/src/tedi/components/form/search/search.component.html
@@ -5,6 +5,7 @@
   [size]="size()"
   [icon]="fieldIcon()"
   [clearable]="clearable() && !isDisabled()"
+  [showClearOnInteraction]="showClearOnInteraction()"
 >
   @if (label()) {
     <label tedi-label [for]="inputId()">
diff --git a/src/tedi/components/form/search/search.component.spec.ts b/src/tedi/components/form/search/search.component.spec.ts
index 74c8db22e..e7982c66b 100644
--- a/src/tedi/components/form/search/search.component.spec.ts
+++ b/src/tedi/components/form/search/search.component.spec.ts
@@ -50,6 +50,21 @@ describe("SearchComponent", () => {
     expect(component).toBeTruthy();
   });
 
+  it("passes showClearOnInteraction to its filled form field", () => {
+    fixture.componentRef.setInput("showClearOnInteraction", true);
+    typeInto("Test");
+    const field = el.querySelector("tedi-form-field") as HTMLElement;
+    expect(
+      field.classList.contains("tedi-form-field--clear-on-interaction"),
+    ).toBe(true);
+
+    fixture.componentRef.setInput("clearable", false);
+    fixture.detectChanges();
+    expect(
+      field.classList.contains("tedi-form-field--clear-on-interaction"),
+    ).toBe(false);
+  });
+
   it("should render a search landmark with role and searchbox input", () => {
     expect(el.getAttribute("role")).toBe("search");
     expect(getInput().getAttribute("role")).toBe("searchbox");
diff --git a/src/tedi/components/form/search/search.component.ts b/src/tedi/components/form/search/search.component.ts
index a1dfaea06..bb4a282a5 100644
--- a/src/tedi/components/form/search/search.component.ts
+++ b/src/tedi/components/form/search/search.component.ts
@@ -160,6 +160,12 @@ export class SearchComponent<T = unknown> implements ControlValueAccessor {
    * @default true
    */
   clearable = input<boolean>(true);
+  /**
+   * Show the clear button only while the filled search field is hovered or focused.
+   * Requires `clearable`.
+   * @default false
+   */
+  showClearOnInteraction = input<boolean>(false);
   /**
    * Icon shown inside the input. Ignored when `button` is set.
    * @default "search"
diff --git a/src/tedi/components/form/search/search.stories.ts b/src/tedi/components/form/search/search.stories.ts
index 5809d37a8..0a59a0fa4 100644
--- a/src/tedi/components/form/search/search.stories.ts
+++ b/src/tedi/components/form/search/search.stories.ts
@@ -183,6 +183,16 @@ export default {
         defaultValue: { summary: "true" },
       },
     },
+    showClearOnInteraction: {
+      description:
+        "Show the clear button only on hover or focus when the search field has a value. Requires clearable.",
+      control: { type: "boolean" },
+      table: {
+        category: "inputs",
+        type: { summary: "boolean" },
+        defaultValue: { summary: "false" },
+      },
+    },
     searchIcon: {
       description: "Icon shown inside the input. Ignored when `button` is set.",
       control: { type: "object" },
@@ -481,6 +491,20 @@ export const Clearable: Story = {
   }),
 };
 
+/** The clear button appears while the filled search field is hovered or focused. */
+export const ClearButtonOnInteraction: Story = {
+  render: () => ({
+    template: `
+      <tedi-search
+        inputId="search-clear-on-interaction"
+        label="Otsing"
+        value="Lorem ipsum"
+        [showClearOnInteraction]="true"
+      />
+    `,
+  }),
+};
+
 /**
  * Clearable field paired with a search button — the clear (×) empties the field;
  * the button runs the search.
diff --git a/src/tedi/components/form/select/select.component.scss b/src/tedi/components/form/select/select.component.scss
index e24c45fa6..ee6ffeb7c 100644
--- a/src/tedi/components/form/select/select.component.scss
+++ b/src/tedi/components/form/select/select.component.scss
@@ -64,6 +64,26 @@
   display: block;
   width: 100%;
 
+  &--clear-on-interaction &__clear {
+    visibility: hidden;
+  }
+
+  &--clear-on-interaction &__clear + &__arrow {
+    border-left-color: transparent;
+  }
+
+  &--clear-on-interaction &__trigger:hover &__clear,
+  &--clear-on-interaction &__trigger:active &__clear,
+  &--clear-on-interaction &__trigger:focus-within &__clear {
+    visibility: visible;
+  }
+
+  &--clear-on-interaction &__trigger:hover &__clear + &__arrow,
+  &--clear-on-interaction &__trigger:active &__clear + &__arrow,
+  &--clear-on-interaction &__trigger:focus-within &__clear + &__arrow {
+    border-left-color: var(--general-border-primary);
+  }
+
   .tedi-feedback-text {
     margin-top: var(--form-field-outer-spacing);
   }
@@ -96,7 +116,7 @@
     background: none;
     border: none;
 
-    &+.tedi-select__arrow {
+    & + .tedi-select__arrow {
       border-left: 1px solid var(--general-border-primary);
     }
   }
@@ -229,14 +249,15 @@
       display: none;
     }
 
-    &--custom-content:empty+&--label {
+    &--custom-content:empty + &--label {
       display: block;
     }
   }
 
   &__group-name {
     display: block;
-    padding: var(--dropdown-group-label-padding-y) var(--dropdown-group-label-padding-x) var(--layout-grid-gutters-04);
+    padding: var(--dropdown-group-label-padding-y)
+      var(--dropdown-group-label-padding-x) var(--layout-grid-gutters-04);
     font-size: var(--heading-subtitle-small-size);
     font-weight: var(--heading-subtitle-small-weight);
     line-height: var(--heading-subtitle-small-line-height);
@@ -251,7 +272,7 @@
       text-transform: none;
       letter-spacing: inherit;
 
-      &~.tedi-dropdown-item:not(.tedi-select__group-name) {
+      & ~ .tedi-dropdown-item:not(.tedi-select__group-name) {
         padding-left: var(--form-checkbox-radio-subitem-padding-left);
       }
     }
@@ -301,7 +322,8 @@
       // against a wrapper that is allowed to shrink. Without it the wrapper stays
       // as wide as its content and the row overflows, cutting the tag — and its
       // remove button — off instead.
-      &.tedi-select__multiselect-container--ellipsis .tedi-select__multiselect-tags {
+      &.tedi-select__multiselect-container--ellipsis
+        .tedi-select__multiselect-tags {
         flex: 0 1 auto;
       }
     }
@@ -329,7 +351,10 @@
     display: grid;
     grid-template-columns: repeat(auto-fit, var(--tedi-swatch-size));
     gap: var(--tedi-swatch-gap);
-    max-width: calc(var(--tedi-swatch-columns) * (var(--tedi-swatch-size) + var(--tedi-swatch-gap)));
+    max-width: calc(
+      var(--tedi-swatch-columns) *
+        (var(--tedi-swatch-size) + var(--tedi-swatch-gap))
+    );
     padding: var(--dropdown-body-padding-y) var(--dropdown-body-padding-x);
 
     .tedi-dropdown-item {
diff --git a/src/tedi/components/form/select/select.component.spec.ts b/src/tedi/components/form/select/select.component.spec.ts
index d0417a96d..75835e13a 100644
--- a/src/tedi/components/form/select/select.component.spec.ts
+++ b/src/tedi/components/form/select/select.component.spec.ts
@@ -38,6 +38,7 @@ import { InputState } from "../form-field/form-field.component";
       [allowMultiple]="allowMultiple"
       [searchable]="searchable"
       [clearable]="clearable"
+      [showClearOnInteraction]="showClearOnInteraction"
       [showSelectAll]="showSelectAll"
       [selectableGroups]="selectableGroups"
       [groupBy]="groupBy"
@@ -100,6 +101,7 @@ class TestHostComponent {
   allowMultiple = false;
   searchable = false;
   clearable = true;
+  showClearOnInteraction = false;
   showSelectAll = false;
   selectableGroups = false;
   groupBy: string | undefined = undefined;
@@ -407,6 +409,36 @@ describe("SelectComponent", () => {
       expect(getClearButton()).toBeTruthy();
     }));
 
+    it("applies the interaction modifier only to a filled clearable select when opted in", fakeAsync(() => {
+      const element = hostEl.querySelector("tedi-select") as HTMLElement;
+      host.showClearOnInteraction = true;
+      fixture.detectChanges();
+      expect(
+        element.classList.contains("tedi-select--clear-on-interaction"),
+      ).toBe(false);
+
+      host.control.setValue("Option 1");
+      fixture.detectChanges();
+      tick();
+      expect(
+        element.classList.contains("tedi-select--clear-on-interaction"),
+      ).toBe(true);
+      expect(getClearButton()).toBeTruthy();
+
+      host.clearable = false;
+      fixture.detectChanges();
+      expect(
+        element.classList.contains("tedi-select--clear-on-interaction"),
+      ).toBe(false);
+
+      host.clearable = true;
+      host.showClearOnInteraction = false;
+      fixture.detectChanges();
+      expect(
+        element.classList.contains("tedi-select--clear-on-interaction"),
+      ).toBe(false);
+    }));
+
     it("should not show clear button when clearable=false", fakeAsync(() => {
       host.clearable = false;
       host.control.setValue("Option 1");
diff --git a/src/tedi/components/form/select/select.component.ts b/src/tedi/components/form/select/select.component.ts
index 0cf26330c..3669691d8 100644
--- a/src/tedi/components/form/select/select.component.ts
+++ b/src/tedi/components/form/select/select.component.ts
@@ -112,6 +112,8 @@ export enum SpecialOptionControls {
   host: {
     class: "tedi-select",
     "[class.tedi-select--multiselect]": "allowMultiple()",
+    "[class.tedi-select--clear-on-interaction]":
+      "showClearOnInteraction() && clearable() && !!selectedValues().length",
   },
   providers: [
     {
@@ -191,6 +193,12 @@ export class SelectComponent<T = unknown>
    * @default false
    */
   clearable = input<boolean>(false);
+  /**
+   * Show the clear button only while the filled select is hovered or focused.
+   * Requires `clearable`.
+   * @default false
+   */
+  showClearOnInteraction = input<boolean>(false);
 
   /**
    * Element reference used to determine dropdown width.
diff --git a/src/tedi/components/form/select/select.stories.ts b/src/tedi/components/form/select/select.stories.ts
index f9de11aad..e5ab705ee 100644
--- a/src/tedi/components/form/select/select.stories.ts
+++ b/src/tedi/components/form/select/select.stories.ts
@@ -138,6 +138,11 @@ const meta: Meta<SelectComponent> = {
       control: "boolean",
       description: "Whether to show a clear button when a value is selected.",
     },
+    showClearOnInteraction: {
+      control: "boolean",
+      description:
+        "Show the clear button only on hover or focus when a value is selected. Requires clearable.",
+    },
     allowMultiple: {
       control: "boolean",
       description: "Whether multiple items can be selected.",
@@ -258,6 +263,7 @@ const meta: Meta<SelectComponent> = {
     state: "default",
     size: "default",
     clearable: false,
+    showClearOnInteraction: false,
     allowMultiple: false,
     showSelectAll: false,
     selectableGroups: false,
@@ -292,6 +298,7 @@ export const Default: Story = {
         [state]="state"
         [size]="size"
         [clearable]="clearable"
+        [showClearOnInteraction]="showClearOnInteraction"
         [allowMultiple]="allowMultiple"
         [showSelectAll]="showSelectAll"
         [selectableGroups]="selectableGroups"
@@ -1495,3 +1502,22 @@ export const OpenForVisualTest: Story = {
     );
   },
 };
+
+/** The clear button appears while the selected field is hovered or focused. */
+export const ClearButtonOnInteraction: Story = {
+  render: () => ({
+    props: { options: simpleOptions },
+    template: `
+      <tedi-select
+        inputId="select-clear-on-interaction"
+        label="Linn"
+        [options]="options"
+        bindLabel="label"
+        bindValue="value"
+        value="tallinn"
+        [clearable]="true"
+        [showClearOnInteraction]="true"
+      />
+    `,
+  }),
+};
diff --git a/src/tedi/components/form/text-field/text-field.stories.ts b/src/tedi/components/form/text-field/text-field.stories.ts
index 7227edddb..3bb3ced1d 100644
--- a/src/tedi/components/form/text-field/text-field.stories.ts
+++ b/src/tedi/components/form/text-field/text-field.stories.ts
@@ -97,6 +97,16 @@ export default {
         defaultValue: { summary: "false" },
       },
     },
+    showClearOnInteraction: {
+      description:
+        "Show the clear button only on hover or focus when the field has a value. Requires clearable.",
+      control: { type: "boolean" },
+      table: {
+        category: "Form Field inputs",
+        type: { summary: "boolean" },
+        defaultValue: { summary: "false" },
+      },
+    },
     arrowsHidden: {
       description: "Whether to hide arrows for number inputs.",
       control: {
@@ -335,6 +345,18 @@ export const Standalone: StoryObj<TextFieldComponent> = {
   }),
 };
 
+/** The clear button appears while the filled field is hovered or focused. */
+export const ClearButtonOnInteraction: StoryObj<TextFieldComponent> = {
+  render: () => ({
+    template: `
+      <tedi-form-field [clearable]="true" [showClearOnInteraction]="true">
+        <label tedi-label for="clear-on-interaction">Label</label>
+        <input tedi-text-field id="clear-on-interaction" [value]="'Text value'" />
+      </tedi-form-field>
+    `,
+  }),
+};
+
 /**
  * A label that needs a tooltip is composed as `tedi-label-row` + `tedi-info-tooltip`, per the
  * Label documentation. The form field's label slot accepts the row as well as a bare label, so the