diff --git a/api/tbc.lua b/api/tbc.lua
index 314ae450..6b397754 100644
--- a/api/tbc.lua
+++ b/api/tbc.lua
@@ -29,6 +29,10 @@ end
 function pfUI.api.CreateFrame(f, n, p, t)
   if f == "Model" and t == "CooldownFrameTemplate" then
     return _G.CreateFrame("Cooldown", n, p, t)
+  elseif  f == "LootButton" then
+    local ret = _G.CreateFrame("Button", n, p, t)
+    ret.SetSlot = ret.SetID
+    return ret
   else
     return _G.CreateFrame(f, n, p, t)
   end
diff --git a/modules/loot.lua b/modules/loot.lua
index aabe7694..a53892fe 100644
--- a/modules/loot.lua
+++ b/modules/loot.lua
@@ -527,6 +527,8 @@ pfUI:RegisterModule("loot", function ()
       LootFrame.selectedSlot = pfUI.loot.selectedSlot
       LootFrame.selectedQuality = pfUI.loot.selectedQuality
       LootFrame.selectedItemName = pfUI.loot.selectedItemName
+
+      LootSlot(this:GetID())
     end)
 
     frame:SetScript("OnEnter", function()