diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index 82d67bec00894346534405d5723a909d1cf5b099..79b4c78b047d3dee7ff8dd998f76be52ce8ebc16 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -6603,6 +6603,7 @@ function _M:checkSetTalentAuto(tid, v, opt)
 		end
 		if opt == 3 then list[#list+1] = "- will only trigger if enemies are visible" end
 		if opt == 4 then list[#list+1] = "- will only trigger if enemies are visible and adjacent" end
+		if opt == 5 then list[#list+1] = "- will only trigger if you are not in combat" end
 
 		if #list == 0 then
 			doit()
diff --git a/game/modules/tome/class/NPC.lua b/game/modules/tome/class/NPC.lua
index 63a8c227201d0a6b746cc8df72f25b887265f79b..33ce02e24652a4d8f915fe6b98468be57406ef37 100644
--- a/game/modules/tome/class/NPC.lua
+++ b/game/modules/tome/class/NPC.lua
@@ -137,7 +137,7 @@ function _M:automaticTalents()
 		local t = self.talents_def[tid]
 		local spotted = spotHostiles(self)
 		if (t.mode ~= "sustained" or not self.sustain_talents[tid]) and not self.talents_cd[tid] and self:preUseTalent(t, true, true) and (not t.auto_use_check or t.auto_use_check(self, t)) then
-			if (c == 1) or (c == 2 and #spotted <= 0) or (c == 3 and #spotted > 0) then
+			if (c == 1) or (c == 2 and #spotted <= 0) or (c == 3 and #spotted > 0) or (c == 5 and not self.in_combat) then
 				if c ~= 2 then
 					-- Do not fire hostile talents
 					--self:useTalent(tid)
diff --git a/game/modules/tome/class/Player.lua b/game/modules/tome/class/Player.lua
index 011ef9fc8c4941904d5eeb2dc84a2973a0df50c6..976a1f98a803ea277798a72a434595653a2ac565 100644
--- a/game/modules/tome/class/Player.lua
+++ b/game/modules/tome/class/Player.lua
@@ -923,7 +923,7 @@ function _M:automaticTalents()
 		if cd <= turns_used and t.mode ~= "sustained" then
 			game.logPlayer(self, "Automatic use of talent %s #DARK_RED#skipped#LAST#: cooldown too low (%d).", self:getTalentDisplayName(t), cd)
 		elseif (t.mode ~= "sustained" or not self.sustain_talents[tid]) and not self.talents_cd[tid] and self:preUseTalent(t, true, true) and (not t.auto_use_check or t.auto_use_check(self, t)) then
-			if (c == 1) or (c == 2 and #spotted <= 0) or (c == 3 and #spotted > 0) then
+			if (c == 1) or (c == 2 and #spotted <= 0) or (c == 3 and #spotted > 0) or (c == 5 and not self.in_combat) then
 				if c ~= 2 then
 					uses[#uses+1] = {name=t.name, turns_used=turns_used, cd=cd, fct=function() self:useTalent(tid) end}
 				else
diff --git a/game/modules/tome/dialogs/UseTalents.lua b/game/modules/tome/dialogs/UseTalents.lua
index fcc1ed52e8ed88fbed0a58b6978a1f08d32f0bac..6cb5d182bb1e4afa1830a8ddc3c1a56e79e78270 100644
--- a/game/modules/tome/dialogs/UseTalents.lua
+++ b/game/modules/tome/dialogs/UseTalents.lua
@@ -175,6 +175,7 @@ function _M:use(item, button)
 		table.insert(list, 2, {name=autoMark:getDisplayString()..(automode==2 and ds or "").."Auto-use when no enemies are visible", what=(automode==2 and "auto-dis" or "auto-en-2")})
 		table.insert(list, 2, {name=autoMark:getDisplayString()..(automode==3 and ds or "").."Auto-use when enemies are visible", what=(automode==3 and "auto-dis" or "auto-en-3")})
 		table.insert(list, 2, {name=autoMark:getDisplayString()..(automode==4 and ds or "").."Auto-use when enemies are visible and adjacent", what=(automode==4 and "auto-dis" or "auto-en-4")})
+		table.insert(list, 2, {name=autoMark:getDisplayString()..(automode==5 and ds or "").."Auto-use when out of combat", what=(automode==5 and "auto-dis" or "auto-en-5")})				
 		self:triggerHook{"UseTalents:generate", actor=self.actor, talent=t, menu=list}
 
 		for i = 1, 12 * self.actor.nb_hotkey_pages do list[#list+1] = {name="Hotkey "..i, what=i} end
@@ -210,6 +211,8 @@ function _M:use(item, button)
 				self.actor:checkSetTalentAuto(item.talent, true, 3)
 			elseif b.what == "auto-en-4" then
 				self.actor:checkSetTalentAuto(item.talent, true, 4)
+			elseif b.what == "auto-en-5" then
+				self.actor:checkSetTalentAuto(item.talent, true, 5)
 			elseif b.what == "auto-dis" then
 				self.actor:checkSetTalentAuto(item.talent, false)
 			elseif b.what == "chat-link" then