diff --git a/Activities/GameActivity.cpp b/Activities/GameActivity.cpp
index 87945b145..be92f33d7 100644
--- a/Activities/GameActivity.cpp
+++ b/Activities/GameActivity.cpp
@@ -400,14 +400,12 @@ bool GameActivity::IsBuyGUIVisible(int which) const {
 
 bool GameActivity::LockControlledActor(Players player, bool lock, Controller::InputMode lockToMode) {
 	if (player >= Players::PlayerOne && player < Players::MaxPlayerCount) {
+		bool prevLock = m_LuaLockActor[player];
 		m_LuaLockActor[player] = lock;
 		m_LuaLockActorMode[player] = lockToMode;
-		if (m_pBuyGUI[player]->IsVisible() || m_InventoryMenuGUI[player]->IsVisible()) {
-			m_LuaLockActor[player] = false;
-			return false;
-		}
 		return true;
 	}
+	return false;
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Activities/GameActivity.h b/Activities/GameActivity.h
index 34c6b548c..a60b9595c 100644
--- a/Activities/GameActivity.h
+++ b/Activities/GameActivity.h
@@ -255,7 +255,6 @@ class GameActivity : public Activity {
 	/// <summary>
 	/// Locks a player controlled actor to a specific controller mode.
 	/// Locking the actor will disable player input, including switching actors.
-	/// Locking will fail if the actor is already locked for another reason (such as being in a menu).
 	/// </summary>
 	/// <param name="player">Which player to lock the actor for.</param>
 	/// <param name="lock">Whether to lock or unlock the actor. (Default: true)</param>