diff --git a/features/closewatcher.yml b/features/closewatcher.yml
new file mode 100644
index 00000000000..73ab925610c
--- /dev/null
+++ b/features/closewatcher.yml
@@ -0,0 +1,11 @@
+name: CloseWatcher
+description: "The `CloseWatcher` API listens and responds to close requests on in-page components, such as modals, popovers, and sidebars."
+spec: https://html.spec.whatwg.org/multipage/interaction.html#close-requests-and-close-watchers
+compat_features:
+  - api.CloseWatcher
+  - api.CloseWatcher.CloseWatcher
+  - api.CloseWatcher.cancel_event
+  - api.CloseWatcher.close
+  - api.CloseWatcher.close_event
+  - api.CloseWatcher.destroy
+  - api.CloseWatcher.requestClose
diff --git a/features/closewatcher.yml.dist b/features/closewatcher.yml.dist
new file mode 100644
index 00000000000..731c38f0cf6
--- /dev/null
+++ b/features/closewatcher.yml.dist
@@ -0,0 +1,17 @@
+# Generated from: closewatcher.yml
+# Do not edit this file by hand. Edit the source file instead!
+
+status:
+  baseline: false
+  support:
+    chrome: "126"
+    chrome_android: "126"
+    edge: "126"
+compat_features:
+  - api.CloseWatcher
+  - api.CloseWatcher.CloseWatcher
+  - api.CloseWatcher.cancel_event
+  - api.CloseWatcher.close
+  - api.CloseWatcher.close_event
+  - api.CloseWatcher.destroy
+  - api.CloseWatcher.requestClose
diff --git a/features/draft/spec/html.yml b/features/draft/spec/html.yml
index 83b1ace9f7e..b6b4dee3328 100644
--- a/features/draft/spec/html.yml
+++ b/features/draft/spec/html.yml
@@ -8,13 +8,6 @@ compat_features:
   - api.BeforeUnloadEvent
   - api.CanvasPattern
   - api.CanvasPattern.setTransform
-  - api.CloseWatcher
-  - api.CloseWatcher.CloseWatcher
-  - api.CloseWatcher.cancel_event
-  - api.CloseWatcher.close
-  - api.CloseWatcher.close_event
-  - api.CloseWatcher.destroy
-  - api.CloseWatcher.requestClose
   - api.CustomElementRegistry.get
   - api.CustomElementRegistry.getName
   - api.CustomElementRegistry.upgrade
diff --git a/features/draft/spec/html.yml.dist b/features/draft/spec/html.yml.dist
index ca934e7ebf0..4d6df43caf4 100644
--- a/features/draft/spec/html.yml.dist
+++ b/features/draft/spec/html.yml.dist
@@ -3850,13 +3850,6 @@ compat_features:
   #   chrome: "126"
   #   chrome_android: "126"
   #   edge: "126"
-  - api.CloseWatcher
-  - api.CloseWatcher.CloseWatcher
-  - api.CloseWatcher.cancel_event
-  - api.CloseWatcher.close
-  - api.CloseWatcher.close_event
-  - api.CloseWatcher.destroy
-  - api.CloseWatcher.requestClose
   - api.HTMLImageElement.sizes.auto
   - api.PageRevealEvent.viewTransition
   - api.PageSwapEvent.viewTransition