diff --git a/tabler/Forms/FindForm.cs b/tabler/Forms/FindForm.cs
index 974d0d4..991bca7 100644
--- a/tabler/Forms/FindForm.cs
+++ b/tabler/Forms/FindForm.cs
@@ -34,6 +34,7 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
         {
             if (keyData == Keys.Escape)
             {
+                _gridUi.FindFormOpen = false;
                 Close();
                 return true;
             }
diff --git a/tabler/Forms/FindForm.resx b/tabler/Forms/FindForm.resx
index 5ba7e5c..04d83c8 100644
--- a/tabler/Forms/FindForm.resx
+++ b/tabler/Forms/FindForm.resx
@@ -130,7 +130,7 @@
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="cbSearchTerm.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
+    <value>1</value>
   </data>
   <data name="&gt;&gt;cbSearchTerm.Name" xml:space="preserve">
     <value>cbSearchTerm</value>
@@ -175,7 +175,7 @@
     <value>75, 23</value>
   </data>
   <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
+    <value>3</value>
   </data>
   <data name="btnClose.Text" xml:space="preserve">
     <value>Close</value>