diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs
index fb99ef6b5..a329e7768 100644
--- a/ShareX/Forms/MainForm.cs
+++ b/ShareX/Forms/MainForm.cs
@@ -81,9 +81,10 @@ private void InitializeControls()
             Text = Program.Title;
 
             UpdateTheme();
+
+            this.CloseOnEscape();
             cmsTray.IgnoreSeparatorClick();
             cmsTaskInfo.IgnoreSeparatorClick();
-
             tsddbWorkflows.HideImageMargin();
             tsmiTrayWorkflows.HideImageMargin();
             tsmiMonitor.HideImageMargin();
@@ -1256,17 +1257,6 @@ protected override void SetVisibleCore(bool value)
             base.SetVisibleCore(value);
         }
 
-        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
-        {
-            if (keyData == Keys.Escape)
-            {
-                Close();
-                return true;
-            }
-
-            return base.ProcessCmdKey(ref msg, keyData);
-        }
-
         private void MainForm_Shown(object sender, EventArgs e)
         {
             AfterShownJobs();