diff --git a/config/shortcutsConfig.json b/config/shortcutsConfig.json
index 4359730be..ebf1463fb 100644
--- a/config/shortcutsConfig.json
+++ b/config/shortcutsConfig.json
@@ -55,7 +55,7 @@
 		"adventureZoomOut":         "Keypad -",
 		"adventureZoomReset":       "Backspace",
 		"battleAutocombat":         "A",
-		"battleAutocombatEnd":      "E",
+		"battleAutocombatEnd":      "Q",
 		"battleCastSpell":          "C",
 		"battleConsoleDown":        "Down",
 		"battleConsoleUp":          "Up",
@@ -68,8 +68,8 @@
 		"battleTacticsEnd":         [ "Return", "Keypad Enter"],
 		"battleTacticsNext":        "Space",
 		"battleToggleHeroesStats":  [],
-		"battleToggleQueue":        "Q",
-		"battleUseCreatureSpell":   "F",
+		"battleToggleQueue":        "Z",
+		"battleUseCreatureSpell":   ["F", "G"],
 		"battleWait":               "W",
 		"exchangeArmySwap":         "F10",
 		"exchangeArmyToLeft":       [],