diff --git a/completion.lua b/completion.lua
index 571b818..20ba5bc 100644
--- a/completion.lua
+++ b/completion.lua
@@ -1,4 +1,5 @@
-Aux.completion = {}
+local private, public = {}, {}
+Aux.completion = public
 
 local NUM_MATCHES = 5
 
@@ -50,7 +51,7 @@ function generate_suggestions(input)
 	return Aux.util.map(best, function(match) return { text=match.name, display_text='|c'..Aux_QualityColor(({GetItemInfo(match.id)})[3])..'['..match.name..']'..'|r', value=match.id } end)
 end
 
-function Aux.completion.completor(edit_box)
+function public.completor(edit_box)
 	local self = {}
 	
 	local suggestions = {}
@@ -161,7 +162,7 @@ function Aux.completion.completor(edit_box)
 	return self
 end
 
-function Aux.completion.selector(edit_box)
+function public.selector(edit_box)
     local self = {}
 
     local suggestions = {}
@@ -194,6 +195,10 @@ function Aux.completion.selector(edit_box)
             toggle()
         end
         toggle()
+		DropDownList1.aux = true
+		DropDownList1:SetScript('OnHide', function()
+			DropDownList1.aux = false
+		end)
     end
 
     function update_highlighting()
@@ -261,3 +266,9 @@ function Aux.completion.selector(edit_box)
 
     return self
 end
+
+function public.UIDropDownMenu_StartCounting(frame)
+	if not frame.aux then
+		return Aux.orig.UIDropDownMenu_StartCounting(frame)
+	end
+end
\ No newline at end of file
diff --git a/completion.xml b/completion.xml
index 4932b22..c1338bc 100644
--- a/completion.xml
+++ b/completion.xml
@@ -4,9 +4,5 @@
 	
 	<Frame name="AuxCompletionDropDown" inherits="UIDropDownMenuTemplate" hidden="true">
 		<Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="555" y="0"/></Offset></Anchor></Anchors>
-        <OnUpdate>
-            this.isCounting = false
-            UIDropDownMenu_OnUpdate(arg1)
-        </OnUpdate>
 	</Frame>
 </Ui>
\ No newline at end of file
diff --git a/core.lua b/core.lua
index cbab416..e9f6ef9 100644
--- a/core.lua
+++ b/core.lua
@@ -1,4 +1,4 @@
-AuxVersion = '2.1.5'
+AuxVersion = '2.1.6'
 AuxAuthors = 'shirsig; Zerf; Zirco (Auctionator); Nimeral (Auctionator backport)'
 
 local lastRightClickAction = GetTime()
@@ -131,6 +131,9 @@ function Aux_SetupHookFunctions()
     Aux.orig.AuctionFrameAuctions_OnEvent = AuctionFrameAuctions_OnEvent
     AuctionFrameAuctions_OnEvent = Aux.AuctionFrameAuctions_OnEvent
 
+    Aux.orig.UIDropDownMenu_StartCounting = UIDropDownMenu_StartCounting
+    UIDropDownMenu_StartCounting = Aux.completion.UIDropDownMenu_StartCounting
+
 end
 
 function Aux.GetOwnerAuctionItems(page)