diff --git a/Advanced Software Engineering/Advanced Software Engineering/DrawPreview.cs b/Advanced Software Engineering/Advanced Software Engineering/DrawPreview.cs
index e31f818..d822c47 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/DrawPreview.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/DrawPreview.cs	
@@ -76,5 +76,10 @@ namespace Advanced_Software_Engineering
             commander.RemoveAllCommands();
         }
 
+        public void ReleaseCommandLock() {
+            textBox1.Enabled = true;
+            button1.Enabled = true;
+        }
+
     }
 }
diff --git a/Advanced Software Engineering/Advanced Software Engineering/TextEditor.cs b/Advanced Software Engineering/Advanced Software Engineering/TextEditor.cs
index 8d16244..e6a2f00 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/TextEditor.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/TextEditor.cs	
@@ -23,7 +23,9 @@ namespace Advanced_Software_Engineering {
         }
 
         private void Console_FormClosed(object sender, FormClosedEventArgs e) {
+            if (DisplayForm != null || !DisplayForm.IsDisposed) DisplayForm.ReleaseCommandLock();
             SettingsAndHelperFunctions.WindowClosed();
+            Dispose();
         }
 
         private void newFileToolStripMenuItem_Click(object sender, EventArgs e) {