diff --git a/contributors.md b/contributors.md
index 25c4082a91..34c3d18bde 100644
--- a/contributors.md
+++ b/contributors.md
@@ -178,6 +178,7 @@ The following people are not part of the development team, but have been contrib
 * (ocalhoun6)
 * Sean Payne (seanmajorpayne)
 * Soham Roy (sohamroy19)
+* Gaven Rendell (Rendello)
 
 ## Toolchain
 * (Balletie) - macOS
diff --git a/src/openrct2-ui/UiContext.cpp b/src/openrct2-ui/UiContext.cpp
index 9031f447a1..b5510dec5e 100644
--- a/src/openrct2-ui/UiContext.cpp
+++ b/src/openrct2-ui/UiContext.cpp
@@ -523,6 +523,15 @@ public:
 #endif
                 case SDL_KEYDOWN:
                 {
+#ifndef __MACOSX__
+                    // Ignore winkey keydowns. Handles edge case where tiling
+                    // window managers don't eat the keypresses when changing
+                    // workspaces.
+                    if (SDL_GetModState() & KMOD_GUI)
+                    {
+                        break;
+                    }
+#endif
                     _textComposition.HandleMessage(&e);
                     auto ie = GetInputEventFromSDLEvent(e);
                     ie.State = InputEventState::Down;