diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpCompletionBinding.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpCompletionBinding.cs
index 3f71a528d1..1e9943d962 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpCompletionBinding.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpCompletionBinding.cs
@@ -127,7 +127,7 @@ namespace CSharpBinding.Completion
 			
 			DefaultCompletionItemList list = new DefaultCompletionItemList();
 			list.Items.AddRange(FilterAndAddTemplates(editor, completionData.Cast<ICompletionItem>().ToList()));
-			if (list.Items.Count > 0) {
+			if (list.Items.Count > 0 && (ctrlSpace || cce.AutoCompleteEmptyMatch)) {
 				list.SortItems();
 				list.PreselectionLength = caretOffset - startPos;
 				list.PostselectionLength = Math.Max(0, startPos + triggerWordLength - caretOffset);