diff --git a/app/src/gambas3/.lang/.pot b/app/src/gambas3/.lang/.pot
index a56c821bc..31a8c644b 100644
--- a/app/src/gambas3/.lang/.pot
+++ b/app/src/gambas3/.lang/.pot
@@ -573,7 +573,7 @@ msgstr ""
 
 #: CWaitingAnimation.class:56 FColorChooser.form:60 FConflict.class:185
 #: FConnectionEditor.class:387 FCreateFile.form:461 FDebugInfo.form:263
-#: FEditor.class:2343 FExportData.class:126 FFieldChooser.form:138
+#: FEditor.class:2348 FExportData.class:126 FFieldChooser.form:138
 #: FFileProperty.class:140 FFontChooser.form:40 FForm.class:3167
 #: FGotoLine.form:23 FHelpBrowser.form:61 FImageEditor.class:351
 #: FImageOffsetSelection.form:33 FImageQuality.form:30 FImageResize.form:49
@@ -586,7 +586,7 @@ msgstr ""
 #: FReportBrushChooser.form:36 FReportCoordChooser.form:26
 #: FReportPaddingChooser.form:75 FSave.form:28 FSaveProjectAs.form:76
 #: FSearch.class:869 FSelectExtraFile.form:43 FSelectIcon.form:87
-#: FSnippet.form:57 FTableChooser.form:68 FText.form:41 FTextEditor.class:611
+#: FSnippet.form:57 FTableChooser.form:68 FText.form:41 FTextEditor.class:613
 #: FTranslate.class:554 Project.module:508
 msgid "Cancel"
 msgstr ""
@@ -1657,14 +1657,14 @@ msgstr ""
 msgid "Procedure list"
 msgstr ""
 
-#: FEditor.class:2343 FImageEditor.class:351 FTextEditor.class:611
+#: FEditor.class:2348 FImageEditor.class:351 FTextEditor.class:613
 msgid ""
 "The file has been modified.\n"
 "\n"
 "All your changes will be lost."
 msgstr ""
 
-#: FEditor.class:2765 FTextEditor.class:1021
+#: FEditor.class:2770 FTextEditor.class:1023
 msgid "(Declarations)"
 msgstr ""
 
@@ -4417,15 +4417,15 @@ msgstr ""
 msgid "Text editor"
 msgstr ""
 
-#: FTextEditor.class:822
+#: FTextEditor.class:824
 msgid "The file has been compressed from &1 to &2 bytes (&3)."
 msgstr ""
 
-#: FTextEditor.class:822
+#: FTextEditor.class:824
 msgid "Original file has been saved in the <b>Project</b> folder."
 msgstr ""
 
-#: FTextEditor.class:828
+#: FTextEditor.class:830
 msgid "Unable to compress file."
 msgstr ""
 
diff --git a/app/src/gambas3/.src/Editor/Code/FEditor.class b/app/src/gambas3/.src/Editor/Code/FEditor.class
index 27ca83997..0465e80af 100644
--- a/app/src/gambas3/.src/Editor/Code/FEditor.class
+++ b/app/src/gambas3/.src/Editor/Code/FEditor.class
@@ -315,6 +315,11 @@ Public Sub Delete()
   
   FSearch.OnFileChange(Me.Path)
   FDebugInfo.RefreshTabs(Me.Path, Me.Name)
+
+  $hBookmark = Null
+  $hCompletion = Null
+  $hInsertColor = Null
+
   Super.Delete
   
 End
@@ -1434,7 +1439,7 @@ End
 
 Public Sub Form_Hide()
 
-  $hCompletion.Hide
+  Try $hCompletion.Hide
   'Project.Deactivate(ME)
 
 End
@@ -3727,3 +3732,4 @@ Public Sub mnuBookmark_Show()
   $hBookmark.Update
   
 End
+
diff --git a/app/src/gambas3/.src/Editor/Code/FTextEditor.class b/app/src/gambas3/.src/Editor/Code/FTextEditor.class
index 49a1ae644..d59bd3d26 100644
--- a/app/src/gambas3/.src/Editor/Code/FTextEditor.class
+++ b/app/src/gambas3/.src/Editor/Code/FTextEditor.class
@@ -55,6 +55,8 @@ Private $iLastLine As Integer
 
 Public Sub _new(sPath As String, Optional bModule As Boolean)
 
+  $iLastLine = -1
+
   Path = sPath
   Editor = edtEditor
   
@@ -1189,7 +1191,7 @@ End
 
 Public Sub Form_Hide()
 
-  $hCompletion.Hide
+  Try $hCompletion.Hide
 
 End
 
@@ -1332,3 +1334,12 @@ Public Sub GetKeywords() As String[]
   Return Highlight._GetKeywords(Editor.Highlight)
   
 End
+
+Public Sub Delete()
+
+  $hBookmark = Null
+  $hCompletion = Null
+  $hInsertColor = Null
+  Super.Delete
+
+End