diff --git a/src/events/SDL_keymap.c b/src/events/SDL_keymap.c
index d48b03788d..8dff3b94ca 100644
--- a/src/events/SDL_keymap.c
+++ b/src/events/SDL_keymap.c
@@ -1080,7 +1080,7 @@ SDL_Keycode SDL_GetKeyFromName(const char *name)
             SDL_Keymap *keymap = SDL_GetCurrentKeymap();
             SDL_Keymod modstate;
             SDL_Scancode scancode = SDL_GetKeymapScancode(keymap, key, &modstate);
-            if (scancode != SDL_SCANCODE_UNKNOWN && (modstate & SDL_KMOD_SHIFT)) {
+            if (scancode != SDL_SCANCODE_UNKNOWN && (modstate & (SDL_KMOD_SHIFT | SDL_KMOD_CAPS))) {
                 key = SDL_GetKeymapKeycode(keymap, scancode, SDL_KMOD_NONE);
             }
         }