diff --git a/src/MainWidget.cpp b/src/MainWidget.cpp
index ff10c27..ea6fc9b 100644
--- a/src/MainWidget.cpp
+++ b/src/MainWidget.cpp
@@ -953,12 +953,19 @@ void MainWidget::setupText(VButton& v)
 
 	// lowercase text
 	KeySym keysym_l = XkbKeycodeToKeysym(display, keycode, 0, 0);
-	TQString btn_text(TQChar((uint)keysym2ucs(keysym_l)));
-	v.setText(btn_text);
+	TQChar c((uint)keysym2ucs(keysym_l));
+	if (c == '&')
+	{
+		v.setText("&&");
+	}
+	else
+	{
+		v.setText(c);
+	}
 
 	// uppercase text
 	KeySym keysym_u = XkbKeycodeToKeysym(display, keycode, 0, 1);
-	TQChar c((uint)keysym2ucs(keysym_u));
+	c = (uint)keysym2ucs(keysym_u);
 	if (c == '&')
 	{
 		v.setShiftText("&&");
@@ -976,6 +983,8 @@ void MainWidget::mappingNotify(XMappingEvent *)
 		VButton *v = btns[a];
 		setupText(*v);
 	}
+	updateNumlock();
+	updateShiftCaps();
 }
 
 KbdDock::KbdDock ( MainWidget *m )
diff --git a/src/VButton.cpp b/src/VButton.cpp
index c949612..e44feba 100644
--- a/src/VButton.cpp
+++ b/src/VButton.cpp
@@ -51,6 +51,8 @@ void VButton::shiftCapsPressed(bool shift, bool caps)
 
 void VButton::setText(const TQString& text)
 {
+	// Need to set the pushbutton text to correctly handle those buttons which usually
+	// don't change (tab, shift, caps, Fn, ...)
 	TQPushButton::setText(text);
 	lowerText = text;
 	isAlpha = text.length() == 1 && (text.upper() != text);
diff --git a/src/main.cpp b/src/main.cpp
index d080452..b818489 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -212,7 +212,6 @@ int main(int argc, char **argv)
 	}
 	else
 	{
-		
 		TDECmdLineArgs::init(argc, argv, &about);
 		TDECmdLineArgs::addCmdLineOptions( options );
 		Kvkbd::addCmdLineOptions();