diff --git a/docs/changelog.rst b/docs/changelog.rst
index 6003a237b..46495ca0d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -91,6 +91,8 @@ Detailed list of changes
 
 - kitten @ ls: Fix the ``--self`` flag not working (:iss:`7864`)
 
+- Remote control: Fix ``--match state:self`` not working (:disc:`7886`)
+
 0.36.2 [2024-09-06]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/kitty/rc/base.py b/kitty/rc/base.py
index 6d8c483cd..817919288 100644
--- a/kitty/rc/base.py
+++ b/kitty/rc/base.py
@@ -398,7 +398,7 @@ class RemoteCommand:
             window = window or boss.active_window
             windows = [window] if window else []
             if payload_get(window_match_name):
-                windows = list(boss.match_windows(payload_get(window_match_name)))
+                windows = list(boss.match_windows(payload_get(window_match_name), window))
                 if not windows:
                     raise MatchError(payload_get(window_match_name))
             if payload_get(tab_match_name):
diff --git a/kitty/rc/send_text.py b/kitty/rc/send_text.py
index 7a58faacc..77daeef93 100644
--- a/kitty/rc/send_text.py
+++ b/kitty/rc/send_text.py
@@ -194,7 +194,7 @@ on bracketed paste mode.
 
     def response_from_kitty(self, boss: Boss, window: Optional[Window], payload_get: PayloadGetType) -> ResponseType:
         sid = payload_get('session_id', '')
-        windows = self.windows_for_payload(boss, None, payload_get, window_match_name='match')
+        windows = self.windows_for_payload(boss, window, payload_get, window_match_name='match')
         pdata: str = payload_get('data')
         encoding, _, q = pdata.partition(':')
         session = ''