diff --git a/Plugins/Auctionator.lua b/Plugins/Auctionator.lua
index c617913..7460288 100644
--- a/Plugins/Auctionator.lua
+++ b/Plugins/Auctionator.lua
@@ -542,16 +542,16 @@ function Skillet:AuctionatorSearch(whichOne)
 			end
 		end
 	end
-	if Skillet.db.profile.plugins.ATR.useSearchExact and Auctionator.API.v1.MultiSearchExact then
+	if Atr_SelectPane and Atr_SearchAH then
+		DA.DEBUG(0, "AuctionatorSearch: shoppingListName= "..tostring(shoppingListName)..", items= "..DA.DUMP1(items))
+		local BUY_TAB = 3;
+		Atr_SelectPane(BUY_TAB)
+		Atr_SearchAH(shoppingListName, items)
+	elseif Skillet.db.profile.plugins.ATR.useSearchExact and Auctionator.API.v1.MultiSearchExact then
 		DA.DEBUG(0, "AuctionatorSearch: (exact) addonName= "..tostring(addonName)..", items= "..DA.DUMP1(items))
 		Auctionator.API.v1.MultiSearchExact(addonName, items)
 	elseif Auctionator.API.v1.MultiSearch then
 		DA.DEBUG(0, "AuctionatorSearch: addonName= "..tostring(addonName)..", items= "..DA.DUMP1(items))
 		Auctionator.API.v1.MultiSearch(addonName, items)
-	elseif Atr_SelectPane and Atr_SearchAH then
-		DA.DEBUG(0, "AuctionatorSearch: shoppingListName= "..tostring(shoppingListName)..", items= "..DA.DUMP1(items))
-		local BUY_TAB = 3;
-		Atr_SelectPane(BUY_TAB)
-		Atr_SearchAH(shoppingListName, items)
 	end
 end
diff --git a/UI/MainFrame.lua b/UI/MainFrame.lua
index 85fd54d..2f5bff6 100644
--- a/UI/MainFrame.lua
+++ b/UI/MainFrame.lua
@@ -1784,7 +1784,7 @@ function Skillet:UpdateDetailsWindow(skillIndex)
 --
 -- Check for Auction House
 --
-	if AuctionFrame and self.auctionOpen and (AuctionatorLoaded or Auctionator.State.Loaded) and self.ATRPlugin and self.db.profile.plugins.ATR.enabled then
+	if self.auctionOpen and Auctionator and self.ATRPlugin and self.db.profile.plugins.ATR.enabled then
 		SkilletAuctionatorButton:Show()
 	else
 		SkilletAuctionatorButton:Hide()
diff --git a/UI/ShoppingList.lua b/UI/ShoppingList.lua
index c04c504..51c281f 100644
--- a/UI/ShoppingList.lua
+++ b/UI/ShoppingList.lua
@@ -1060,7 +1060,7 @@ function Skillet:DisplayShoppingList(atBank)
 	if not self.shoppingList then
 		self.shoppingList = createShoppingListFrame(self)
 	end
-	if self.auctionOpen and (AuctionatorLoaded or Auctionator.State.Loaded) and self.ATRPlugin and self.db.profile.plugins.ATR.enabled then
+	if self.auctionOpen and Auctionator and self.ATRPlugin and self.db.profile.plugins.ATR.enabled then
 		SkilletSLAuctionatorButton:Show()
 	else
 		SkilletSLAuctionatorButton:Hide()