diff --git a/docs/changelog.rst b/docs/changelog.rst
index af1ae0848..b4e849b52 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -64,6 +64,8 @@ Changelog
   mouse cursor image that can be seen on both light and dark backgrounds
   (:iss:`359`)
 
+- Remote control: Fix the ``focus_window`` command not focusing the
+  top-level OS window of the specified kitty window (:iss:`1003`)
 
 0.12.1 [2018-09-08]
 ------------------------------
diff --git a/kitty/cmds.py b/kitty/cmds.py
index b7f0f23b6..60af99173 100644
--- a/kitty/cmds.py
+++ b/kitty/cmds.py
@@ -573,7 +573,9 @@ def focus_window(boss, window, payload):
             raise MatchError(match)
     for window in windows:
         if window:
-            boss.set_active_window(window)
+            os_window_id = boss.set_active_window(window)
+            if os_window_id:
+                focus_os_window(os_window_id, True)
             break
 # }}}