diff --git a/src/VButton.cpp b/src/VButton.cpp
index c0ce411..46e36ec 100644
--- a/src/VButton.cpp
+++ b/src/VButton.cpp
@@ -85,6 +85,12 @@ void VButton::setupTexts(Display *display)
 	{
 		altGrShiftText = c;
 	}
+
+	// caps + altGr text
+	capsAltGrText = altGrText.upper();
+
+	// caps + altGr + shift text
+	capsAltGrShiftText = altGrShiftText.lower();
 }
 
 void VButton::shiftCapsAltGrPressed(bool shift, bool caps, bool altGrState)
@@ -96,11 +102,11 @@ void VButton::shiftCapsAltGrPressed(bool shift, bool caps, bool altGrState)
 		{
 			if (shift)
 			{
-				TQPushButton::setText(altGrShiftText.lower());
+				TQPushButton::setText(capsAltGrShiftText);
 			}
 			else
 			{
-				TQPushButton::setText(altGrText.upper());
+				TQPushButton::setText(capsAltGrText);
 			}
 		}
 		else if (shift)
diff --git a/src/VButton.h b/src/VButton.h
index 86a58ee..49d5d1f 100644
--- a/src/VButton.h
+++ b/src/VButton.h
@@ -32,10 +32,12 @@ protected:
 	bool isAlpha;
 	unsigned int keycode;
 	TQString normalText;
-	TQString capsText;
 	TQString shiftText;
-	TQString altGrText;
+	TQString capsText;
 	TQString capsShiftText;
+	TQString capsAltGrText;
+	TQString capsAltGrShiftText;
+	TQString altGrText;
 	TQString altGrShiftText;
 	TQRect orig_size;