diff --git a/CHANGELOG.md b/CHANGELOG.md
index 723c2a91..3fbf8355 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,9 @@ Versioning](https://semver.org/spec/v2.0.0.html).
   more specific. Before this change we might use our own XDND implementation
   when dragging from a plugin to a standalone Wine application running within
   the same Wine prefix.
+- Fixed an edge case where clicking inside of a plugin GUI in **REAPER** while
+  the FX window already open in the background would not give keyboard focus to
+  the plugin.
 
 ## [3.5.0] - 2021-06-23
 
diff --git a/src/wine-host/editor.cpp b/src/wine-host/editor.cpp
index 1e0b70b3..72ede613 100644
--- a/src/wine-host/editor.cpp
+++ b/src/wine-host/editor.cpp
@@ -576,16 +576,15 @@ void Editor::handle_x11_events() noexcept {
                         if (!use_xembed) {
                             fix_local_coordinates();
                         }
-                    }
 
-                    // In case the WM somehow does not support
-                    // `_NET_ACTIVE_WINDOW`, a more naive focus grabbing method
-                    // implemented in the `WM_PARENTNOTIFY` handler will be
-                    // used.
-                    if (window == wrapper_window.window &&
-                        supports_ewmh_active_window() &&
-                        is_wine_window_active()) {
-                        set_input_focus(true);
+                        // In case the WM somehow does not support
+                        // `_NET_ACTIVE_WINDOW`, a more naive focus grabbing
+                        // method implemented in the `WM_PARENTNOTIFY` handler
+                        // will be used.
+                        if (supports_ewmh_active_window() &&
+                            is_wine_window_active()) {
+                            set_input_focus(true);
+                        }
                     }
                 } break;
                 // When the user moves their mouse away from the Wine window