diff --git a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
index 539546dd96..ddd51e9b9b 100755
--- a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
+++ b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
@@ -304,8 +304,6 @@ controller::Input::NamedVector KeyboardMouseDevice::InputDevice::getAvailableInp
         availableInputs.append(Input::NamedPair(makeInput(Qt::Key_Control), "Control"));
         availableInputs.append(Input::NamedPair(makeInput(Qt::Key_Delete), "Delete"));
         availableInputs.append(Input::NamedPair(makeInput(Qt::Key_Backspace), QKeySequence(Qt::Key_Backspace).toString()));
-        availableInputs.append(Input::NamedPair(makeInput(Qt::Key_BracketLeft), "BracketLeft"));
-        availableInputs.append(Input::NamedPair(makeInput(Qt::Key_BracketRight), "BracketRight"));
 
         availableInputs.append(Input::NamedPair(makeInput(Qt::LeftButton), "LeftMouseButton"));
         availableInputs.append(Input::NamedPair(makeInput(Qt::MiddleButton), "MiddleMouseButton"));
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index dd53e8c395..b086b5624c 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -1890,18 +1890,10 @@ function toggleKey(value) {
     }
 }
 function focusKey(value) {
-    if (value === 0) { // on release
-        if (selectionManager.hasSelection()) {
-            cameraManager.enable();
-            cameraManager.focus(selectionManager.worldPosition, 
-                                selectionManager.worldDimensions, 
-                                Menu.isOptionChecked(MENU_EASE_ON_FOCUS));
-        }
-    }
-}
-function cameraKey(value) {
     if (value === 0) { // on release
         cameraManager.enable();
+        cameraManager.focus(selectionManager.worldPosition, selectionManager.worldDimensions, 
+                            Menu.isOptionChecked(MENU_EASE_ON_FOCUS));
     }
 }
 function gridKey(value) {
@@ -1917,7 +1909,6 @@ mapping.from([Controller.Hardware.Keyboard.Backspace]).when([Controller.Hardware
 mapping.from([Controller.Hardware.Keyboard.D]).when([Controller.Hardware.Keyboard.Control]).to(deselectKey);
 mapping.from([Controller.Hardware.Keyboard.T]).to(toggleKey);
 mapping.from([Controller.Hardware.Keyboard.F]).to(focusKey);
-mapping.from([Controller.Hardware.Keyboard.BracketLeft]).to(cameraKey);
 mapping.from([Controller.Hardware.Keyboard.G]).to(gridKey);
 
 function recursiveAdd(newParentID, parentData) {