diff --git a/wuttapos/controls/keyboard.py b/wuttapos/controls/keyboard.py
index 6d4e6e7..7350a21 100644
--- a/wuttapos/controls/keyboard.py
+++ b/wuttapos/controls/keyboard.py
@@ -79,7 +79,7 @@ class WuttaKeyboard(WuttaControl):
 
         for key, button in self.keys.items():
             if key in self.caps_map:
-                if self.caps_lock:
+                if self.caps_lock or self.shift:
                     button.content.value = self.caps_map[key]
                 else:
                     button.content.value = key
@@ -96,7 +96,7 @@ class WuttaKeyboard(WuttaControl):
 
         for key, button in self.keys.items():
             if key in self.caps_map:
-                if self.shift:
+                if self.shift or self.caps_lock:
                     button.content.value = self.caps_map[key]
                 else:
                     button.content.value = key