diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ee28f0f..e26faa07 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Native fullscreen transitions would freeze on macOS Mojave due to internal API differences between macOS version [#690](https://github.com/koekeishiya/yabai/issues/690)
 - Report proper error message when trying to use absolute resizing on a managed window [#661](https://github.com/koekeishiya/yabai/issues/661)
 - Space/Window commands that utilize the scripting addition should correctly return a non-zero exit code upon failure [#181](https://github.com/koekeishiya/yabai/issues/181)
+- Undo [#545](https://github.com/koekeishiya/yabai/issues/545) because it created weird issues with focus [#660](https://github.com/koekeishiya/yabai/issues/660)
 
 ## [3.3.4] - 2020-11-14
 ### Changed
diff --git a/src/window_manager.c b/src/window_manager.c
index 336ad79b..f87f65df 100644
--- a/src/window_manager.c
+++ b/src/window_manager.c
@@ -793,11 +793,14 @@ struct window *window_manager_find_smallest_managed_window(struct space_manager
 
 static void window_manager_make_key_window(ProcessSerialNumber *window_psn, uint32_t window_id)
 {
-    uint8_t bytes1[0xf8] = { [0x04] = 0xf8, [0x08] = 0x01, [0x26] = 0xef, [0x27] = 0x7f, [0x2e] = 0xef, [0x2f] = 0x7f };
-    uint8_t bytes2[0xf8] = { [0x04] = 0xf8, [0x08] = 0x02, [0x26] = 0xef, [0x27] = 0x7f, [0x2e] = 0xef, [0x2f] = 0x7f };
+    uint8_t bytes1[0xf8] = { [0x04] = 0xf8, [0x08] = 0x01, [0x3a] = 0x10 };
+    uint8_t bytes2[0xf8] = { [0x04] = 0xf8, [0x08] = 0x02, [0x3a] = 0x10 };
 
     memcpy(bytes1 + 0x3c, &window_id, sizeof(uint32_t));
+    memset(bytes1 + 0x20, 0xFF, 0x10);
+
     memcpy(bytes2 + 0x3c, &window_id, sizeof(uint32_t));
+    memset(bytes2 + 0x20, 0xFF, 0x10);
 
     SLPSPostEventRecordTo(window_psn, bytes1);
     SLPSPostEventRecordTo(window_psn, bytes2);