diff --git a/client/CPlayerInterface.cpp b/client/CPlayerInterface.cpp
index 6003d8105..5d8c0be22 100644
--- a/client/CPlayerInterface.cpp
+++ b/client/CPlayerInterface.cpp
@@ -930,7 +930,6 @@ void CPlayerInterface::battleEnd(const BattleResult *br)
 		isAutoFightOn = false;
 		cb->unregisterBattleInterface(autofightingAI);
 		autofightingAI.reset();
-		adventureInt->quickCombatUnlock();
 
 		if (!battleInt)
 		{
@@ -938,6 +937,7 @@ void CPlayerInterface::battleEnd(const BattleResult *br)
 			// #1490 - during AI turn when quick combat is on, we need to display the message and wait for user to close it.
 			// Otherwise NewTurn causes freeze.
 			waitWhileDialog();
+			adventureInt->quickCombatUnlock();
 			return;
 		}
 	}
@@ -945,6 +945,7 @@ void CPlayerInterface::battleEnd(const BattleResult *br)
 	BATTLE_EVENT_POSSIBLE_RETURN;
 
 	battleInt->battleFinished(*br);
+	adventureInt->quickCombatUnlock();
 }
 
 void CPlayerInterface::battleLogMessage(const std::vector<MetaString> & lines)
diff --git a/client/battle/CBattleInterface.cpp b/client/battle/CBattleInterface.cpp
index e0e0b6713..6606e6dd8 100644
--- a/client/battle/CBattleInterface.cpp
+++ b/client/battle/CBattleInterface.cpp
@@ -1884,7 +1884,7 @@ void CBattleInterface::blockUI(bool on)
 	bSurrender->block(on || curInt->cb->battleGetSurrenderCost() < 0);
 
 	// block only if during enemy turn and auto-fight is off
-	// othervice - crash on accessing non-exisiting active stack
+	// otherwise - crash on accessing non-exisiting active stack
 	bAutofight->block(!curInt->isAutoFightOn && !activeStack);
 
 	if (tacticsMode && btactEnd && btactNext)