diff --git a/buy.lua b/buy.lua
index 0685b4c..5c7eae7 100644
--- a/buy.lua
+++ b/buy.lua
@@ -42,6 +42,10 @@ end
 
 function Aux.buy.SearchButton_onclick()
 
+	if not AuxBuySearchButton:IsVisible() then
+		return
+	end
+	
 	AuxBuySearchButton:Hide()
 	AuxBuyStopButton:Show()
 	
diff --git a/core.lua b/core.lua
index d1472b9..3c0c120 100644
--- a/core.lua
+++ b/core.lua
@@ -446,10 +446,8 @@ function Aux_ContainerFrameItemButton_OnClick(button)
 				AuctionFrameTab_OnClick(Aux.tabs.sell.index)
 			end			
 			return
-		elseif AUX_BUY_SHORTCUT and IsControlKeyDown() and not ChatFrameEditBox:IsVisible() then
-			local container_item = Aux.info.container_item(this:GetParent():GetID(), this:GetID())
+		elseif AUX_BUY_SHORTCUT and IsControlKeyDown() then
 			if PanelTemplates_GetSelectedTab(AuctionFrame) ~= Aux.tabs.buy.index then
-				local container_item = Aux.info.container_item(this:GetParent():GetID(), this:GetID())
 				AuctionFrameTab_OnClick(Aux.tabs.buy.index)
 			end
 			AuxBuyNameInputBox:SetText(container_item.name)