diff --git a/VisualPascalABCNET/DS/CodeCompletionVisual/CodeCompletionWindow.cs b/VisualPascalABCNET/DS/CodeCompletionVisual/CodeCompletionWindow.cs
index 587baedcf..a49bcd3f7 100644
--- a/VisualPascalABCNET/DS/CodeCompletionVisual/CodeCompletionWindow.cs
+++ b/VisualPascalABCNET/DS/CodeCompletionVisual/CodeCompletionWindow.cs
@@ -231,6 +231,11 @@ namespace ICSharpCode.TextEditor.Gui.CompletionWindow
 					return base.ProcessKeyEvent(ch);
 				case CompletionDataProviderKeyResult.NormalKey:
 					// just process normally
+                    if (ch == '_')
+                    {
+                        Close();
+                        return true;
+                    }
 					return base.ProcessKeyEvent(ch);
 				case CompletionDataProviderKeyResult.InsertionKey:
 					return InsertSelectedItem(ch);
@@ -252,12 +257,6 @@ namespace ICSharpCode.TextEditor.Gui.CompletionWindow
 				}
 			}
 		}
-		
-        /*				int xpos = textArea.TextView.GetDrawingXPos(this.line, this.column);
-				return new Point(textArea.TextView.DrawingPosition.X + xpos,
-				                 textArea.TextView.DrawingPosition.Y
-				                 + (textArea.Document.GetVisibleLine(this.line)) * textArea.TextView.FontHeight
-				                 - textArea.TextView.TextArea.VirtualTop.Y);*/
 
         void fiexerrorTextAreaInvalidate()
         {