diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 633ae10d4..2dbbea662 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -740,13 +740,16 @@ namespace MWInput
         if (arg.button == SDL_CONTROLLER_BUTTON_A || arg.button == SDL_CONTROLLER_BUTTON_B) // We'll pretend that A is left click and B is right click
         {
             guiMode = MWBase::Environment::get().getWindowManager()->isGuiMode();
-            guiMode = MyGUI::InputManager::getInstance().injectMousePress(mMouseX, mMouseY, sdlButtonToMyGUI((arg.button == SDL_CONTROLLER_BUTTON_B) ? SDL_BUTTON_RIGHT : SDL_BUTTON_LEFT)) && guiMode;
-            if (MyGUI::InputManager::getInstance ().getMouseFocusWidget () != 0)
+            if(!mInputBinder->detectingBindingState())
             {
-                MyGUI::Button* b = MyGUI::InputManager::getInstance ().getMouseFocusWidget ()->castType<MyGUI::Button>(false);
-                if (b && b->getEnabled())
+                guiMode = MyGUI::InputManager::getInstance().injectMousePress(mMouseX, mMouseY, sdlButtonToMyGUI((arg.button == SDL_CONTROLLER_BUTTON_B) ? SDL_BUTTON_RIGHT : SDL_BUTTON_LEFT)) && guiMode;
+                if (MyGUI::InputManager::getInstance ().getMouseFocusWidget () != 0)
                 {
-                    MWBase::Environment::get().getSoundManager ()->playSound ("Menu Click", 1.f, 1.f);
+                    MyGUI::Button* b = MyGUI::InputManager::getInstance ().getMouseFocusWidget ()->castType<MyGUI::Button>(false);
+                    if (b && b->getEnabled())
+                    {
+                        MWBase::Environment::get().getSoundManager ()->playSound ("Menu Click", 1.f, 1.f);
+                    }
                 }
             }
         }
diff --git a/extern/oics/ICSInputControlSystem_joystick.cpp b/extern/oics/ICSInputControlSystem_joystick.cpp
index 9cd9b1461..d8dbfa112 100644
--- a/extern/oics/ICSInputControlSystem_joystick.cpp
+++ b/extern/oics/ICSInputControlSystem_joystick.cpp
@@ -180,23 +180,26 @@ namespace ICS
                     }
                 }
 			}
-			else if(mDetectingBindingListener)
-			{
-				mDetectingBindingListener->joystickButtonBindingDetected(this,
-					mDetectingBindingControl, evt.button, mDetectingBindingDirection);
-			}
 		}
 	}
 
     void InputControlSystem::buttonReleased(const SDL_ControllerButtonEvent &evt)
 	{
 		if(mActive)
-		{
-            ControlsButtonBinderMapType::const_iterator it = mControlsJoystickButtonBinderMap.find(evt.button);
-            if(it != mControlsJoystickButtonBinderMap.end())
+		{
+            if(!mDetectingBindingControl)
             {
-                it->second.control->setChangingDirection(Control::STOP);
-            }
+                ControlsButtonBinderMapType::const_iterator it = mControlsJoystickButtonBinderMap.find(evt.button);
+                if(it != mControlsJoystickButtonBinderMap.end())
+                {
+                    it->second.control->setChangingDirection(Control::STOP);
+                }
+            }
+            else if(mDetectingBindingListener)
+			{
+				mDetectingBindingListener->joystickButtonBindingDetected(this,
+					mDetectingBindingControl, evt.button, mDetectingBindingDirection);
+			}
 		}
 	}