diff --git a/src/VButton.cpp b/src/VButton.cpp
index 95d31e2..c0ce411 100644
--- a/src/VButton.cpp
+++ b/src/VButton.cpp
@@ -91,8 +91,19 @@ void VButton::shiftCapsAltGrPressed(bool shift, bool caps, bool altGrState)
 {
 	if (altGrState)
 	{
-		// Caps does not seem to make any difference when AltGr is pressed
-		if (shift)
+		// If Caps is on, displayed alpha characters should be toggled from the AltGr case
+		if (caps)
+		{
+			if (shift)
+			{
+				TQPushButton::setText(altGrShiftText.lower());
+			}
+			else
+			{
+				TQPushButton::setText(altGrText.upper());
+			}
+		}
+		else if (shift)
 		{
 			TQPushButton::setText(altGrShiftText);
 		}