diff --git a/Cmdr/CmdrClient/CmdrInterface/Window.lua b/Cmdr/CmdrClient/CmdrInterface/Window.lua
index f2a00f28..2ee222fc 100644
--- a/Cmdr/CmdrClient/CmdrInterface/Window.lua
+++ b/Cmdr/CmdrClient/CmdrInterface/Window.lua
@@ -151,11 +151,9 @@ function Window:LoseFocus(submit)
 
 	self:ClearHistoryState()
 
-	if Gui.Visible and not GuiService.MenuIsOpen then
+	if Gui.Visible and not GuiService.MenuIsOpen and not UserInputService.TouchEnabled then
 		-- self:SetEntryText("")
-		if not UserInputService.TouchEnabled then
-			Entry.TextBox:CaptureFocus()
-		end
+		Entry.TextBox:CaptureFocus()
 	elseif GuiService.MenuIsOpen and Gui.Visible then
 		self:Hide()
 	end