diff --git a/src/addons/lua_engine.cpp b/src/addons/lua_engine.cpp
index 3ebae787..7d819253 100644
--- a/src/addons/lua_engine.cpp
+++ b/src/addons/lua_engine.cpp
@@ -5275,14 +5275,13 @@ void LuaEngine::registerCoreAPI() {
         "    if not link then return end\n"
         "    local id = link:match('item:(%d+)')\n"
         "    if id then\n"
-        "        local name, _, quality = GetItemInfo(tonumber(id))\n"
-        "        if name then self:SetText(name, 1, 1, 1) end\n"
+        "        _WoweePopulateItemTooltip(self, tonumber(id))\n"
         "        return\n"
         "    end\n"
         "    id = link:match('spell:(%d+)')\n"
         "    if id then\n"
-        "        local name = GetSpellInfo(tonumber(id))\n"
-        "        if name then self:SetText(name, 1, 1, 1) end\n"
+        "        self:SetSpellByID(tonumber(id))\n"
+        "        return\n"
         "    end\n"
         "end\n"
         // Shared item tooltip builder using GetItemInfo return values
@@ -5444,8 +5443,7 @@ void LuaEngine::registerCoreAPI() {
         "    if actionType == 'spell' and id and id > 0 then\n"
         "        self:SetSpellByID(id)\n"
         "    elseif actionType == 'item' and id and id > 0 then\n"
-        "        local name, _, quality = GetItemInfo(id)\n"
-        "        if name then self:SetText(name, 1, 1, 1) end\n"
+        "        _WoweePopulateItemTooltip(self, id)\n"
         "    end\n"
         "end\n"
         "function GameTooltip:FadeOut() end\n"