diff --git a/VisualPascalABCNET/Form1.cs b/VisualPascalABCNET/Form1.cs
index 03246728b..114703109 100644
--- a/VisualPascalABCNET/Form1.cs
+++ b/VisualPascalABCNET/Form1.cs
@@ -374,7 +374,7 @@ namespace VisualPascalABC
             tsAutoInsertCode.Checked = true;
             mAUTOINSERTToolStripMenuItem.Checked = true;
 
-            CurrentCodeFileDocument.TextEditor.ActiveTextAreaControl.TextArea.KeyEventHandler += TextArea_KeyEventHandler;
+            //CurrentCodeFileDocument.TextEditor.ActiveTextAreaControl.TextArea.KeyEventHandler += TextArea_KeyEventHandler;
 
             init = true;
             foreach (string FileName in VisualPascalABCProgram.CommandLineArgs)
diff --git a/VisualPascalABCNET/Workbench/WindowOperations.cs b/VisualPascalABCNET/Workbench/WindowOperations.cs
index 541d6d069..b0f8459ab 100644
--- a/VisualPascalABCNET/Workbench/WindowOperations.cs
+++ b/VisualPascalABCNET/Workbench/WindowOperations.cs
@@ -246,7 +246,7 @@ namespace VisualPascalABC
         private CodeFileDocumentControl AddNewProgramToTab(DockPanel tabControl, string FileName)
         {
             CodeFileDocumentControl edit = AddNewTab(tabControl);
-            
+
             edit.FileName = FileName;
             SetTabPageText(edit);
             edit.SetHighlightingStrategyForFile(FileName);
@@ -262,6 +262,8 @@ namespace VisualPascalABC
                 AddEditorHandlers(edit);
             }
             CodeCompletionKeyHandler.Attach(edit.TextEditor);
+            edit.TextEditor.ActiveTextAreaControl.TextArea.KeyEventHandler += TextArea_KeyEventHandler;
+
             //HostCallbackImplementation.Register(this);
 
             //\ivan