diff --git a/Crypto Notepad/ChangeKeyForm.cs b/Crypto Notepad/ChangeKeyForm.cs
index 929add4..fa8259a 100644
--- a/Crypto Notepad/ChangeKeyForm.cs	
+++ b/Crypto Notepad/ChangeKeyForm.cs	
@@ -143,6 +143,10 @@ private void NewKeyTextBox_Leave(object sender, EventArgs e)
 
         private void NewKeyTextBox_KeyDown(object sender, KeyEventArgs e)
         {
+            if (e.KeyCode == Keys.Enter)
+            {
+                e.SuppressKeyPress = true;
+            }
             if (e.KeyCode == Keys.Enter & acceptButton.Enabled)
             {
                 AcceptButton_Click(sender, e);
@@ -151,6 +155,10 @@ private void NewKeyTextBox_KeyDown(object sender, KeyEventArgs e)
 
         private void OldKeyTextBox_KeyDown(object sender, KeyEventArgs e)
         {
+            if (e.KeyCode == Keys.Enter)
+            {
+                e.SuppressKeyPress = true;
+            }
             if (e.KeyCode == Keys.Enter & acceptButton.Enabled)
             {
                 AcceptButton_Click(sender, e);
diff --git a/Crypto Notepad/EnterKeyForm.cs b/Crypto Notepad/EnterKeyForm.cs
index 02edc7b..b3f3f42 100644
--- a/Crypto Notepad/EnterKeyForm.cs	
+++ b/Crypto Notepad/EnterKeyForm.cs	
@@ -54,7 +54,11 @@ private void KeyTextBox_TextChanged(object sender, EventArgs e)
 
         private void KeyTextBox_KeyDown(object sender, KeyEventArgs e)
         {
-            if (e.KeyCode == Keys.Enter && okButton.Enabled)
+            if (e.KeyCode == Keys.Enter)
+            {
+                e.SuppressKeyPress = true;
+            }
+            if (e.KeyCode == Keys.Enter & okButton.Enabled)
             {
                 OkButton_Click(sender, e);
             }
diff --git a/Crypto Notepad/MainForm.cs b/Crypto Notepad/MainForm.cs
index 94b916b..c8573aa 100644
--- a/Crypto Notepad/MainForm.cs	
+++ b/Crypto Notepad/MainForm.cs	
@@ -1661,6 +1661,10 @@ private void FileLockedShowKey_Click(object sender, EventArgs e)
 
         private void FileLockedKeyTextBox_KeyDown(object sender, KeyEventArgs e)
         {
+            if (e.KeyCode == Keys.Enter)
+            {
+                e.SuppressKeyPress = true;
+            }
             if (e.KeyCode == Keys.Enter & fileLockedOkButton.Enabled)
             {
                 FileLockedOkButton_Click(sender, e);