diff --git a/docs/changelog.rst b/docs/changelog.rst
index ad74c9060..3636076c3 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -31,6 +31,9 @@ To update |kitty|, :doc:`follow the instructions <binary>`.
 - macOS: Render multi-cell PUA characters centered, matching behavior on other
   platforms
 
+- Linux: Ignore keys is they are designated as layout/group/mode switch keys
+  (:iss:`2519`)
+
 
 0.17.2 [2020-03-29]
 --------------------
diff --git a/glfw/xkb_glfw.c b/glfw/xkb_glfw.c
index 54dc20d5c..18d7e5e52 100644
--- a/glfw/xkb_glfw.c
+++ b/glfw/xkb_glfw.c
@@ -620,6 +620,9 @@ glfw_xkb_handle_key_event(_GLFWwindow *window, _GLFWXKBData *xkb, xkb_keycode_t
         }
         if (key_text[0]) { debug("%s: %s ", text_type, key_text); }
     }
+    if (xkb_sym == XKB_KEY_ISO_First_Group || xkb_sym == XKB_KEY_ISO_Last_Group || xkb_sym == XKB_KEY_ISO_Next_Group || xkb_sym == XKB_KEY_ISO_Prev_Group || xkb_sym == XKB_KEY_Mode_switch) {
+      return;
+    }
     int glfw_sym = glfw_key_for_sym(xkb_sym);
     bool is_fallback = false;
     if (glfw_sym == GLFW_KEY_UNKNOWN && !key_text[0]) {