diff --git a/SPD-classes/src/main/java/com/watabou/input/KeyBindings.java b/SPD-classes/src/main/java/com/watabou/input/KeyBindings.java
index 1fd7bc752..4bd44c9ce 100644
--- a/SPD-classes/src/main/java/com/watabou/input/KeyBindings.java
+++ b/SPD-classes/src/main/java/com/watabou/input/KeyBindings.java
@@ -47,13 +47,13 @@ public class KeyBindings {
 		hardBindings.put(keyCode, action);
 	}
 
-	public static boolean acceptUnbound = false;
+	public static boolean bindingKey = false;
 
 	public static boolean isKeyBound(int keyCode){
 		if (keyCode <= 0 || keyCode > 255){
 			return false;
 		}
-		return acceptUnbound || bindings.containsKey( keyCode ) || hardBindings.containsKey( keyCode );
+		return bindingKey || bindings.containsKey( keyCode ) || hardBindings.containsKey( keyCode );
 	}
 	
 	public static GameAction getActionForKey(KeyEvent event){
diff --git a/SPD-classes/src/main/java/com/watabou/input/KeyEvent.java b/SPD-classes/src/main/java/com/watabou/input/KeyEvent.java
index 2e3d35218..cbaf43865 100644
--- a/SPD-classes/src/main/java/com/watabou/input/KeyEvent.java
+++ b/SPD-classes/src/main/java/com/watabou/input/KeyEvent.java
@@ -64,10 +64,13 @@ public class KeyEvent {
 		for (KeyEvent k : keyEvents){
 			if (KeyBindings.getActionForKey(k) == GameAction.LEFT_CLICK){
 				PointerEvent.emulateMouseButton(PointerEvent.LEFT, k.pressed);
+				if (KeyBindings.bindingKey) keySignal.dispatch(k);
 			} else if (KeyBindings.getActionForKey(k) == GameAction.RIGHT_CLICK){
 				PointerEvent.emulateMouseButton(PointerEvent.RIGHT, k.pressed);
+				if (KeyBindings.bindingKey) keySignal.dispatch(k);
 			} else if (KeyBindings.getActionForKey(k) == GameAction.MIDDLE_CLICK){
 				PointerEvent.emulateMouseButton(PointerEvent.MIDDLE, k.pressed);
+				if (KeyBindings.bindingKey) keySignal.dispatch(k);
 			} else {
 				keySignal.dispatch(k);
 			}
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndKeyBindings.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndKeyBindings.java
index e8edcbad8..967fba48d 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndKeyBindings.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndKeyBindings.java
@@ -443,7 +443,7 @@ public class WndKeyBindings extends Window {
 			add(btnCancel);
 
 			resize(WIDTH, (int)btnCancel.bottom());
-			KeyBindings.acceptUnbound = true;
+			KeyBindings.bindingKey = true;
 
 		}
 
@@ -484,7 +484,7 @@ public class WndKeyBindings extends Window {
 		@Override
 		public void destroy() {
 			super.destroy();
-			KeyBindings.acceptUnbound = false;
+			KeyBindings.bindingKey = false;
 		}
 
 	}