diff --git a/src/libs/tgfclient/tgfclient.h b/src/libs/tgfclient/tgfclient.h
index 57495845f..0b028519b 100644
--- a/src/libs/tgfclient/tgfclient.h
+++ b/src/libs/tgfclient/tgfclient.h
@@ -230,14 +230,19 @@ TGFCLIENT_API tScreenSize* GfScrGetDefaultSizes(int* pnSizes);
 #define GFUIK_F14	SDLK_F14
 #define GFUIK_F15	SDLK_F15
 
+#define GFUIK_RSHIFT	SDLK_RSHIFT
+#define GFUIK_LSHIFT	SDLK_LSHIFT
+
 // Add needed other GFUIK_* here or above.
 
 // Maximun value of a key code (Has to be the least greater  2^N - 1 >= SDLK_LAST)
 #define GFUIK_MAX	GF_MAX_KEYCODE
 
+#if SDL_MAJOR_VERSION < 2 // SDLK_LAST no longer defined as of SDL2
 #if (GFUIK_MAX < SDLK_LAST)
 # error SDLK_MAX has grown too much, please increase GF_MAX_KEYCODE to the least greater power of 2 minus 1.
 #endif
+#endif
 
 
 /** Scroll bar call-back information */
diff --git a/src/modules/userinterface/legacymenu/confscreens/controlconfig.cpp b/src/modules/userinterface/legacymenu/confscreens/controlconfig.cpp
index 97c0cef3a..9c9c872bd 100644
--- a/src/modules/userinterface/legacymenu/confscreens/controlconfig.cpp
+++ b/src/modules/userinterface/legacymenu/confscreens/controlconfig.cpp
@@ -327,6 +327,9 @@ onKeyAction(int key, int /* modifier */, int state)
     if (!InputWaited || state == GFUI_KEY_UP) {
 	return 0;
     }
+    if (key == GFUIK_RSHIFT || key == GFUIK_LSHIFT) {
+        return 0;
+    }
     if (key == GFUIK_ESCAPE) {
 	/* escape */
 	Cmd[CurrentCmd].ref.index = -1;