diff --git a/src/preferences/keymap/KeyboardLayoutView.cpp b/src/preferences/keymap/KeyboardLayoutView.cpp
index 3bec5be5f1..4764d1b9aa 100644
--- a/src/preferences/keymap/KeyboardLayoutView.cpp
+++ b/src/preferences/keymap/KeyboardLayoutView.cpp
@@ -27,7 +27,8 @@ static const rgb_color kLitIndicatorColor = {116, 212, 83, 255};
 
 
 KeyboardLayoutView::KeyboardLayoutView(const char* name)
-	: BView(name, B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE | B_FRAME_EVENTS),
+	:
+	BView(name, B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE | B_FRAME_EVENTS),
 	fOffscreenBitmap(NULL),
 	fKeymap(NULL),
 	fEditable(true),
@@ -236,7 +237,7 @@ KeyboardLayoutView::MouseMoved(BPoint point, uint32 transit,
 	if (fKeymap == NULL)
 		return;
 
-	// rule out dragging for tertiary mouse button
+	// prevent dragging for tertiary mouse button
 	if ((fButtons & B_TERTIARY_MOUSE_BUTTON) != 0)
 		return;
 
@@ -470,6 +471,8 @@ KeyboardLayoutView::MessageReceived(BMessage* message)
 					fKeymap->Modifier(fDropTarget->code));
 				fKeymap->SetModifier(fDropTarget->code, modifier);
 			}
+
+			_InvalidateKey(fDragKey);
 		}
 
 		_InvalidateKey(fDropTarget);
diff --git a/src/preferences/keymap/KeymapWindow.cpp b/src/preferences/keymap/KeymapWindow.cpp
index 4bd17a973a..dbfd6c7834 100644
--- a/src/preferences/keymap/KeymapWindow.cpp
+++ b/src/preferences/keymap/KeymapWindow.cpp
@@ -9,6 +9,7 @@
  *		Axel Dörfler, axeld@pinc-software.de.
  */
 
+
 #include "KeymapWindow.h"
 
 #include <string.h>
@@ -62,7 +63,8 @@ static const char* kCurrentKeymapName = "(Current)";
 
 
 KeymapWindow::KeymapWindow()
-	: BWindow(BRect(80, 50, 880, 380), "Keymap", B_TITLED_WINDOW,
+	:
+	BWindow(BRect(80, 50, 880, 380), "Keymap", B_TITLED_WINDOW,
 		B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS)
 {
 	SetLayout(new BGroupLayout(B_VERTICAL));
@@ -311,7 +313,7 @@ KeymapWindow::MessageReceived(BMessage* message)
 
 		case kMsgDeadKeyAcuteChanged:
 		{
-			BMenuItem *item = fAcuteMenu->FindMarked();
+			BMenuItem* item = fAcuteMenu->FindMarked();
 			if (item != NULL) {
 				const char* trigger = item->Label();
 				if (strcmp(trigger, kDeadKeyTriggerNone) == 0)
@@ -324,7 +326,7 @@ KeymapWindow::MessageReceived(BMessage* message)
 
 		case kMsgDeadKeyCircumflexChanged:
 		{
-			BMenuItem *item = fCircumflexMenu->FindMarked();
+			BMenuItem* item = fCircumflexMenu->FindMarked();
 			if (item != NULL) {
 				const char* trigger = item->Label();
 				if (strcmp(trigger, kDeadKeyTriggerNone) == 0)
@@ -337,7 +339,7 @@ KeymapWindow::MessageReceived(BMessage* message)
 
 		case kMsgDeadKeyDiaeresisChanged:
 		{
-			BMenuItem *item = fDiaeresisMenu->FindMarked();
+			BMenuItem* item = fDiaeresisMenu->FindMarked();
 			if (item != NULL) {
 				const char* trigger = item->Label();
 				if (strcmp(trigger, kDeadKeyTriggerNone) == 0)
@@ -350,7 +352,7 @@ KeymapWindow::MessageReceived(BMessage* message)
 
 		case kMsgDeadKeyGraveChanged:
 		{
-			BMenuItem *item = fGraveMenu->FindMarked();
+			BMenuItem* item = fGraveMenu->FindMarked();
 			if (item != NULL) {
 				const char* trigger = item->Label();
 				if (strcmp(trigger, kDeadKeyTriggerNone) == 0)
@@ -363,7 +365,7 @@ KeymapWindow::MessageReceived(BMessage* message)
 
 		case kMsgDeadKeyTildeChanged:
 		{
-			BMenuItem *item = fTildeMenu->FindMarked();
+			BMenuItem* item = fTildeMenu->FindMarked();
 			if (item != NULL) {
 				const char* trigger = item->Label();
 				if (strcmp(trigger, kDeadKeyTriggerNone) == 0)