diff --git a/modules/group.lua b/modules/group.lua
index 3c682b32..c2e39b8b 100644
--- a/modules/group.lua
+++ b/modules/group.lua
@@ -145,7 +145,10 @@ pfUI:RegisterModule("group", function ()
       GameTooltip:SetOwner(this, "ANCHOR_NONE");
       GameTooltip:SetUnit("party" .. this.id);
       GameTooltip:Show()
+    end)
 
+    pfUI.uf.group[i]:SetScript("OnLeave", function()
+      GameTooltip:FadeOut()
     end)
 
     pfUI.uf.group[i]:SetScript("OnClick", function ()
diff --git a/modules/raid.lua b/modules/raid.lua
index e8217f51..d902f58a 100644
--- a/modules/raid.lua
+++ b/modules/raid.lua
@@ -113,7 +113,10 @@ pfUI:RegisterModule("raid", function ()
         GameTooltip:SetOwner(this, "ANCHOR_NONE");
         GameTooltip:SetUnit("raid" .. this.id);
         GameTooltip:Show()
+      end)
 
+      pfUI.uf.raid[i]:SetScript("OnLeave", function()
+        GameTooltip:FadeOut()
       end)
 
       pfUI.uf.raid[i]:SetScript("OnClick", function ()