diff --git a/interface/resources/controllers/keyboardMouse.json b/interface/resources/controllers/keyboardMouse.json
index 660bc281e3..80933a2489 100644
--- a/interface/resources/controllers/keyboardMouse.json
+++ b/interface/resources/controllers/keyboardMouse.json
@@ -1,11 +1,10 @@
 {
     "name": "Keyboard/Mouse to Actions",
     "channels": [
-        { "from": "Keyboard.A", "when": "Keyboard.RightMouseButton", "to": "Actions.LATERAL_LEFT" },
-        { "from": "Keyboard.D", "when": "Keyboard.RightMouseButton", "to": "Actions.LATERAL_RIGHT" },
-        { "from": "Keyboard.E", "to": "Actions.LATERAL_RIGHT" },
-        { "from": "Keyboard.Q", "to": "Actions.LATERAL_LEFT" },
-
+        { "from": "Keyboard.A", "when": ["Keyboard.RightMouseButton", "!Keyboard.Control"], "to": "Actions.LATERAL_LEFT" },
+        { "from": "Keyboard.D", "when": ["Keyboard.RightMouseButton", "!Keyboard.Control"], "to": "Actions.LATERAL_RIGHT" },
+        { "from": "Keyboard.E", "when": "!Keyboard.Control", "to": "Actions.LATERAL_RIGHT" },
+        { "from": "Keyboard.Q", "when": "!Keyboard.Control", "to": "Actions.LATERAL_LEFT" },
 
         { "comment" : "Mouse turn need to be small continuous increments",
           "from": { "makeAxis" : [
@@ -87,21 +86,41 @@
         },
 
         { "from": { "makeAxis" : [
-                ["Keyboard.A", "Keyboard.TouchpadLeft"],
-                ["Keyboard.D", "Keyboard.TouchpadRight"]
+                ["Keyboard.A"],
+                ["Keyboard.D"]
+            ]
+          },
+          "when": ["Application.CameraFirstPerson", "!Keyboard.Control"],
+          "to": "Actions.Yaw"
+        },
+        
+        { "from": { "makeAxis" : [
+                ["Keyboard.A"],
+                ["Keyboard.D"]
+            ]
+          },
+          "when": ["Application.CameraThirdPerson", "!Keyboard.Control"],
+          "to": "Actions.Yaw"
+        },
+        
+        { "from": { "makeAxis" : [
+                ["Keyboard.TouchpadLeft"],
+                ["Keyboard.TouchpadRight"]
             ]
           },
           "when": "Application.CameraFirstPerson",
           "to": "Actions.Yaw"
         },
+        
         { "from": { "makeAxis" : [
-                ["Keyboard.A", "Keyboard.TouchpadLeft"],
-                ["Keyboard.D", "Keyboard.TouchpadRight"]
+                ["Keyboard.TouchpadLeft"],
+                ["Keyboard.TouchpadRight"]
             ]
           },
           "when": "Application.CameraThirdPerson",
           "to": "Actions.Yaw"
         },
+        
         { "from": { "makeAxis" : ["Keyboard.MouseMoveLeft", "Keyboard.MouseMoveRight"] },
           "when": "Keyboard.RightMouseButton",
           "to": "Actions.Yaw",
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 85a2d9a699..460109dc87 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -1782,7 +1782,7 @@ var keyReleaseEvent = function (event) {
     // since sometimes our menu shortcut keys don't work, trap our menu items here also and fire the appropriate menu items
     if (event.text === "DELETE") {
         deleteSelectedEntities();
-    } else if (event.text === "ESC") {
+    } else if (event.text === 'd' && event.isControl) {
         selectionManager.clearSelections();
     } else if (event.text === "t") {
         selectionDisplay.toggleSpaceMode();