diff --git a/Crypto Notepad/Forms/PasswordGeneratorFrom.Designer.cs b/Crypto Notepad/Forms/PasswordGeneratorFrom.Designer.cs
index cfbceb8..7bf9d88 100644
--- a/Crypto Notepad/Forms/PasswordGeneratorFrom.Designer.cs	
+++ b/Crypto Notepad/Forms/PasswordGeneratorFrom.Designer.cs	
@@ -242,6 +242,7 @@ private void InitializeComponent()
             this.Name = "PasswordGeneratorFrom";
             this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
             this.Text = "Password Generator";
+            this.Deactivate += new System.EventHandler(this.PasswordGeneratorFrom_Deactivate);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.PasswordGeneratorFrom_FormClosing);
             this.Load += new System.EventHandler(this.PasswordGeneratorFrom_Load);
             this.groupBox1.ResumeLayout(false);
diff --git a/Crypto Notepad/Forms/PasswordGeneratorFrom.cs b/Crypto Notepad/Forms/PasswordGeneratorFrom.cs
index e623087..6ca6516 100644
--- a/Crypto Notepad/Forms/PasswordGeneratorFrom.cs	
+++ b/Crypto Notepad/Forms/PasswordGeneratorFrom.cs	
@@ -169,6 +169,11 @@ private void CopyAllButton_MouseEnter(object sender, EventArgs e)
         {
             passwordGeneratorToolTip.SetToolTip(copyAllButton, null);
         }
+
+        private void PasswordGeneratorFrom_Deactivate(object sender, EventArgs e)
+        {
+            PasswordGeneratorFrom_FormClosing(null, null);
+        }
         #endregion