diff --git a/docs/src/api/class-elementhandle.md b/docs/src/api/class-elementhandle.md
index a14f91156a7de..a411154541ed9 100644
--- a/docs/src/api/class-elementhandle.md
+++ b/docs/src/api/class-elementhandle.md
@@ -656,6 +656,8 @@ Throws for non-input elements. However, if the element is inside the `<label>` e
 ### option: ElementHandle.inputValue.timeout = %%-input-timeout-js-%%
 * since: v1.13
 
+### option: ElementHandle.inputValue.signal = %%-input-signal-%%
+
 ## async method: ElementHandle.isChecked
 * since: v1.8
 * discouraged: Use locator-based [`method: Locator.isChecked`] instead. Read more about [locators](../locators.md).
diff --git a/packages/playwright-client/types/types.d.ts b/packages/playwright-client/types/types.d.ts
index 9df5611d2ab15..fbc196cc44890 100644
--- a/packages/playwright-client/types/types.d.ts
+++ b/packages/playwright-client/types/types.d.ts
@@ -12979,6 +12979,17 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    * @param options
    */
   inputValue(options?: {
+    /**
+     * Allows to cancel the operation using an
+     * [`AbortSignal`](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal). If the signal is aborted, the
+     * operation will be aborted and throw an error. Note that providing a signal does not disable the default timeout,
+     * which can be changed using
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout); pass
+     * `timeout: 0` to disable the timeout entirely.
+     */
+    signal?: AbortSignal;
+
     /**
      * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
      * option in the config, or by using the
diff --git a/packages/playwright-core/src/client/channels.d.ts b/packages/playwright-core/src/client/channels.d.ts
index 91d2ffbeb50e3..f8c7338fedad6 100644
--- a/packages/playwright-core/src/client/channels.d.ts
+++ b/packages/playwright-core/src/client/channels.d.ts
@@ -3238,8 +3238,12 @@ export type ElementHandleInnerTextOptions = {};
 export type ElementHandleInnerTextResult = {
   value: string,
 };
-export type ElementHandleInputValueParams = {};
-export type ElementHandleInputValueOptions = {};
+export type ElementHandleInputValueParams = {
+  timeout: number,
+};
+export type ElementHandleInputValueOptions = {
+
+};
 export type ElementHandleInputValueResult = {
   value: string,
 };
diff --git a/packages/playwright-core/src/client/elementHandle.ts b/packages/playwright-core/src/client/elementHandle.ts
index effa91c589d27..a711ae577f0ff 100644
--- a/packages/playwright-core/src/client/elementHandle.ts
+++ b/packages/playwright-core/src/client/elementHandle.ts
@@ -69,8 +69,8 @@ export class ElementHandle<T extends Node = Node> extends JSHandle<T> implements
     return value === undefined ? null : value;
   }
 
-  async inputValue(): Promise<string> {
-    return (await this._elementChannel.inputValue({}, undefined)).value;
+  async inputValue(options: channels.ElementHandleInputValueOptions & TimeoutOptions = {}): Promise<string> {
+    return (await this._elementChannel.inputValue({ ...options, timeout: this._frame._timeout(options) }, options.signal)).value;
   }
 
   async textContent(): Promise<string | null> {
diff --git a/packages/playwright-core/src/protocol/validator.ts b/packages/playwright-core/src/protocol/validator.ts
index 2e037ab2b58e4..6cf0b21d5ebca 100644
--- a/packages/playwright-core/src/protocol/validator.ts
+++ b/packages/playwright-core/src/protocol/validator.ts
@@ -1830,7 +1830,9 @@ scheme.ElementHandleInnerTextParams = tOptional(tObject({}));
 scheme.ElementHandleInnerTextResult = tObject({
   value: tString,
 });
-scheme.ElementHandleInputValueParams = tOptional(tObject({}));
+scheme.ElementHandleInputValueParams = tObject({
+  timeout: tFloat,
+});
 scheme.ElementHandleInputValueResult = tObject({
   value: tString,
 });
diff --git a/packages/playwright-core/src/server/channels.d.ts b/packages/playwright-core/src/server/channels.d.ts
index a28946f3b63a1..ffcc9d1e88960 100644
--- a/packages/playwright-core/src/server/channels.d.ts
+++ b/packages/playwright-core/src/server/channels.d.ts
@@ -3241,8 +3241,12 @@ export type ElementHandleInnerTextOptions = {};
 export type ElementHandleInnerTextResult = {
   value: string,
 };
-export type ElementHandleInputValueParams = {};
-export type ElementHandleInputValueOptions = {};
+export type ElementHandleInputValueParams = {
+  timeout: number,
+};
+export type ElementHandleInputValueOptions = {
+
+};
 export type ElementHandleInputValueResult = {
   value: string,
 };
diff --git a/packages/playwright-core/types/types.d.ts b/packages/playwright-core/types/types.d.ts
index 9df5611d2ab15..fbc196cc44890 100644
--- a/packages/playwright-core/types/types.d.ts
+++ b/packages/playwright-core/types/types.d.ts
@@ -12979,6 +12979,17 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    * @param options
    */
   inputValue(options?: {
+    /**
+     * Allows to cancel the operation using an
+     * [`AbortSignal`](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal). If the signal is aborted, the
+     * operation will be aborted and throw an error. Note that providing a signal does not disable the default timeout,
+     * which can be changed using
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout); pass
+     * `timeout: 0` to disable the timeout entirely.
+     */
+    signal?: AbortSignal;
+
     /**
      * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
      * option in the config, or by using the
diff --git a/packages/protocol/spec/handles.yml b/packages/protocol/spec/handles.yml
index 54440f7018607..4cd21a3b347e1 100644
--- a/packages/protocol/spec/handles.yml
+++ b/packages/protocol/spec/handles.yml
@@ -313,6 +313,8 @@ ElementHandle:
     inputValue:
       title: Get input value
       group: getter
+      parameters:
+        timeout: float
       returns:
         value: string
       flags: