diff --git a/src/gui/OptionsDlg.hx b/src/gui/OptionsDlg.hx
index 225e8a1f..2581d582 100644
--- a/src/gui/OptionsDlg.hx
+++ b/src/gui/OptionsDlg.hx
@@ -328,6 +328,9 @@ class OptionsDlg extends GuiImage {
 			remapDlg.remapCallback = (key) -> {
 				MarbleGame.canvas.popDialog(remapDlg);
 
+				if (key == Key.ESCAPE)
+					return;
+
 				var conflicting = getConflictingBinding(bindingName, key);
 				if (conflicting == null) {
 					ctrl.txtCtrl.text.text = Util.getKeyForButton2(key);
diff --git a/src/gui/RemapDlg.hx b/src/gui/RemapDlg.hx
index 3cf82b7c..4484fd9f 100644
--- a/src/gui/RemapDlg.hx
+++ b/src/gui/RemapDlg.hx
@@ -43,9 +43,9 @@ class RemapDlg extends GuiControl {
 	public override function update(dt:Float, mouseState:MouseState) {
 		super.update(dt, mouseState);
 		for (i in 0...1024) {
-			if (i == 5)
+			if (i == Key.MOUSE_WHEEL_DOWN || i == Key.MOUSE_WHEEL_UP)
 				continue;
-			if (Key.isDown(i)) {
+			if (Key.isPressed(i)) {
 				remapCallback(i);
 			}
 		}