diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XPathQueryControl.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XPathQueryControl.cs
index 18d4df5722..95d66bf9a9 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XPathQueryControl.cs
+++ b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XPathQueryControl.cs
@@ -515,10 +515,11 @@ namespace ICSharpCode.XmlEditor
 		
 		void InitAutoCompleteMode()
 		{
-			try {
+			// Auto-completion disabled due to bug - see SD2-1049 - XPath query combo box is case insensitive
+			/*try {
 				xPathComboBox.AutoCompleteMode = AutoCompleteMode.Suggest;
 				xPathComboBox.AutoCompleteSource = AutoCompleteSource.ListItems;
-			} catch (ThreadStateException) { }
+			} catch (ThreadStateException) { }*/
 		}
 		
 		void XPathResultsListViewItemActivate(object sender, EventArgs e)