diff --git a/Tukui/Modules/Tooltips/Core.lua b/Tukui/Modules/Tooltips/Core.lua
index 671dbbec2ba9c7a7ab5a196b73000106041f49b5..55abb09c3137a0d4586eb7702f5783ca338e8961 100755
--- a/Tukui/Modules/Tooltips/Core.lua
+++ b/Tukui/Modules/Tooltips/Core.lua
@@ -394,6 +394,10 @@ function Tooltip:Enable()
 	if C["Tooltips"].ShowSpec then
 		T.Tooltips.Talent:RegisterEvent("MODIFIER_STATE_CHANGED")
 	end
+	
+	-- WoW 8.2 bug? Tooltip ClampedToScreen switching to false randomly for no reason
+	GameTooltip:SetClampedToScreen(true)
+	GameTooltip.SetClampedToScreen = function() end
 end
 
 T["Tooltips"] = Tooltip