diff --git a/core/tooltip.lua b/core/tooltip.lua
index 8c08b81..aa0041a 100644
--- a/core/tooltip.lua
+++ b/core/tooltip.lua
@@ -52,7 +52,7 @@ function LOAD()
     end)
 end
 
-function extend_tooltip(tooltip, link, quantity)
+function M.extend_tooltip(tooltip, link, quantity)
     local item_id, suffix_id = info.parse_link(link)
     quantity = IsShiftKeyDown() and quantity or 1
     if aux_tooltip_disenchant_source then
diff --git a/gui/auction_listing.lua b/gui/auction_listing.lua
index a076de8..af865eb 100644
--- a/gui/auction_listing.lua
+++ b/gui/auction_listing.lua
@@ -9,6 +9,7 @@ local money = require 'aux.util.money'
 local history = require 'aux.core.history'
 local gui = require 'aux.gui'
 local search_tab = require 'aux.tabs.search'
+local tooltip = require 'aux.core.tooltip'
 
 local price_per_unit = false
 
@@ -584,7 +585,9 @@ local methods = {
         local rt = this:GetParent().row.rt
         local rowData = this:GetParent().row.data
         if rowData and rowData.record then
-            info.set_tooltip(rowData.record.itemstring, this, 'ANCHOR_RIGHT')
+	        GameTooltip:SetOwner(this, 'ANCHOR_RIGHT')
+            info.load_tooltip(GameTooltip, rowData.record.tooltip)
+	        tooltip.extend_tooltip(GameTooltip, rowData.record.link, rowData.record.aux_quantity)
             info.set_shopping_tooltip(rowData.record.slot)
         end
     end,
diff --git a/util/info.lua b/util/info.lua
index dd1e796..45441cd 100644
--- a/util/info.lua
+++ b/util/info.lua
@@ -200,7 +200,6 @@ function M.set_shopping_tooltip(slot)
         ShoppingTooltip1:SetOwner(GameTooltip, 'ANCHOR_NONE')
         ShoppingTooltip1:SetPoint('TOPLEFT', GameTooltip, 'TOPRIGHT', 0, -10)
         load_tooltip(ShoppingTooltip1, tooltips[1])
-        ShoppingTooltip1:Show()
     end
 
     if tooltips[2] then
@@ -208,7 +207,6 @@ function M.set_shopping_tooltip(slot)
         ShoppingTooltip2:SetOwner(ShoppingTooltip1, 'ANCHOR_NONE')
         ShoppingTooltip2:SetPoint('TOPLEFT', ShoppingTooltip1, 'TOPRIGHT')
         load_tooltip(ShoppingTooltip2, tooltips[2])
-        ShoppingTooltip2:Show()
     end
 end
 
@@ -246,6 +244,7 @@ function M.load_tooltip(frame, tooltip)
 	    _G[frame:GetName() .. 'TextLeft' .. i]:SetJustifyH('LEFT')
 	    _G[frame:GetName() .. 'TextRight' .. i]:SetJustifyH('LEFT')
     end
+    frame:Show()
 end
 
 function M.display_name(item_id, no_brackets, no_color)