diff --git a/src/mred/wxme/wx_keym.cxx b/src/mred/wxme/wx_keym.cxx
index 3ecfd246c1..03fe825c0b 100644
--- a/src/mred/wxme/wx_keym.cxx
+++ b/src/mred/wxme/wx_keym.cxx
@@ -615,9 +615,9 @@ void wxKeymap::MapFunction(wxchar *keys, char *fname)
       if ((code > 0) && (code < 127) && isalpha(code)) {
 	if (shift > 0) {
 #ifdef wx_mac
-	  if ((meta < 1) && (ctrl < 1))
+	  if (meta < 1)
 #endif
-#if defined(wx_msw) || defined(wx_xt)
+#if defined(wx_msw)
 	    if ((ctrl < 1) || (meta > 0))
 #endif
 	      code = toupper(code);
diff --git a/src/wxmac/src/mac/wx_app.cc b/src/wxmac/src/mac/wx_app.cc
index 0c2abad82a..01ce4af2a2 100644
--- a/src/wxmac/src/mac/wx_app.cc
+++ b/src/wxmac/src/mac/wx_app.cc
@@ -701,9 +701,9 @@ void wxApp::doMacKeyUpDown(Bool down)
 
           mods = cCurrentEvent.modifiers;
 
-          /* Strip Caps Lock and Shift when Control is pressed. */
+          /* Strip Caps Lock when Control is pressed. */
           if (mods & (controlKey & wxMacDisableMods))
-            mods -= (mods & (alphaLock | shiftKey));
+            mods -= (mods & alphaLock);
 
           if (mods & cmdKey) {
             int mask;
diff --git a/src/wxxt/src/Windows/Window.cc b/src/wxxt/src/Windows/Window.cc
index ffeb2da39f..a7a5647626 100644
--- a/src/wxxt/src/Windows/Window.cc
+++ b/src/wxxt/src/Windows/Window.cc
@@ -1797,8 +1797,8 @@ Status wxWindow::LookupKey(int unshifted, int unalted, int caps_mode,
   memcpy(&evt, &(xev->xkey), sizeof(XKeyPressedEvent));
 
   if ((evt.state & ControlMask) && !(evt.state & Mod1Mask)) {
-    /* Control (and not AltGr) => cancel Shift and Caps Lock */
-    evt.state -= (evt.state & (ShiftMask | LockMask));
+    /* Control (and not AltGr) => cancel Caps Lock */
+    evt.state -= (evt.state & LockMask);
   }
 
   if (unshifted) {