--- a/ActionButton.lua	Fri May 06 15:52:21 2011 -0700
+++ b/ActionButton.lua	Tue May 10 10:32:11 2011 -0700
@@ -123,7 +123,7 @@
 
 local _onReceiveDrag = -- function(self, button, kind, value, ...)
 [[
-  if kind ~= "spell" and kind ~= "item" and kind ~= "macro" and kind ~= "flyout" then
+  if kind ~= "spell" and kind ~= "item" and kind ~= "macro" and kind ~= "flyout" and kind ~= "equipmentset" and kind ~= "companion" then
     return kind, value, ...
   else
     if showgrid_event and showgrid_event > 0 then
@@ -158,6 +158,7 @@
   "PLAYER_TARGET_CHANGED",
   "TRADE_SKILL_SHOW",
   "TRADE_SKILL_CLOSE",
+  "ARCHAEOLOGY_CLOSED",
   "PLAYER_ENTER_COMBAT",
   "PLAYER_LEAVE_COMBAT",
   "START_AUTOREPEAT_SPELL",
@@ -746,7 +747,8 @@
 function Action:TRADE_SKILL_SHOW()
   self:UpdateCheckedState()
 end
-Action.TRADE_SKILL_CLOSE = Action.TRADE_SKILL_CLOSE
+Action.TRADE_SKILL_CLOSE = Action.TRADE_SKILL_SHOW
+Action.ARCHAEOLOGY_CLOSED = Action.TRADE_SKILL_SHOW
 
 function Action:UNIT_ENTERED_VEHICLE(event,unit)
   if unit == "player" then