diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index b0c0109b71..77140fc0d3 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2710,22 +2710,6 @@ void Application::update(float deltaTime) {
     auto myAvatar = getMyAvatar();
     auto userInputMapper = DependencyManager::get<UserInputMapper>();
     userInputMapper->setSensorToWorldMat(myAvatar->getSensorToWorldMatrix());
-  //  userInputMapper->update(deltaTime);
-
-    // This needs to go after userInputMapper->update() because of the keyboard
-    bool jointsCaptured = false;
-    auto inputPlugins = PluginManager::getInstance()->getInputPlugins();
-    foreach(auto inputPlugin, inputPlugins) {
-        QString name = inputPlugin->getName();
-        QAction* action = Menu::getInstance()->getActionForOption(name);
-        if (action && action->isChecked()) {
-            inputPlugin->pluginUpdate(deltaTime, jointsCaptured);
-            if (inputPlugin->isJointController()) {
-                jointsCaptured = true;
-            }
-        }
-    }
-
     // Dispatch input events
     _controllerScriptingInterface->update();
 
diff --git a/interface/src/scripting/ControllerScriptingInterface.cpp b/interface/src/scripting/ControllerScriptingInterface.cpp
index 931c97a7d2..1e35713e16 100644
--- a/interface/src/scripting/ControllerScriptingInterface.cpp
+++ b/interface/src/scripting/ControllerScriptingInterface.cpp
@@ -173,15 +173,18 @@ void ControllerScriptingInterface::update() {
     float delta = now - last;
     last = now;
 
-    for(auto inputPlugin : PluginManager::getInstance()->getInputPlugins()) {
+    DependencyManager::get<UserInputMapper>()->update(delta);
+
+    bool jointsCaptured = false;
+    for (auto inputPlugin : PluginManager::getInstance()->getInputPlugins()) {
         if (inputPlugin->isActive()) {
-            inputPlugin->pluginUpdate(delta, false);
+            inputPlugin->pluginUpdate(delta, jointsCaptured);
+            if (inputPlugin->isJointController()) {
+                jointsCaptured = true;
+            }
         }
     }
 
-    auto userInputMapper = DependencyManager::get<UserInputMapper>();
-    userInputMapper->update(delta);
-
     for (auto entry : _inputControllers) {
         entry.second->update();
     }