diff --git a/NBTExplorer/Windows/Find.Designer.cs b/NBTExplorer/Windows/Find.Designer.cs
index daae1eb..fcfbc2f 100644
--- a/NBTExplorer/Windows/Find.Designer.cs
+++ b/NBTExplorer/Windows/Find.Designer.cs
@@ -38,8 +38,6 @@
             // _cbName
             // 
             this._cbName.AutoSize = true;
-            this._cbName.Checked = true;
-            this._cbName.CheckState = System.Windows.Forms.CheckState.Checked;
             this._cbName.Location = new System.Drawing.Point(13, 13);
             this._cbName.Name = "_cbName";
             this._cbName.Size = new System.Drawing.Size(57, 17);
@@ -65,6 +63,7 @@
             this._textName.Name = "_textName";
             this._textName.Size = new System.Drawing.Size(273, 20);
             this._textName.TabIndex = 2;
+            this._textName.TextChanged += new System.EventHandler(this._textName_TextChanged);
             // 
             // _textValue
             // 
@@ -74,6 +73,7 @@
             this._textValue.Name = "_textValue";
             this._textValue.Size = new System.Drawing.Size(273, 20);
             this._textValue.TabIndex = 3;
+            this._textValue.TextChanged += new System.EventHandler(this._textValue_TextChanged);
             // 
             // _buttonFind
             // 
diff --git a/NBTExplorer/Windows/Find.cs b/NBTExplorer/Windows/Find.cs
index f2e007a..42f2285 100644
--- a/NBTExplorer/Windows/Find.cs
+++ b/NBTExplorer/Windows/Find.cs
@@ -41,5 +41,15 @@ namespace NBTExplorer.Windows
             DialogResult = DialogResult.Cancel;
             Close();
         }
+
+        private void _textName_TextChanged (object sender, EventArgs e)
+        {
+            _cbName.Checked = true;
+        }
+
+        private void _textValue_TextChanged (object sender, EventArgs e)
+        {
+            _cbValue.Checked = true;
+        }
     }
 }
diff --git a/NBTExplorer/Windows/Find.resx b/NBTExplorer/Windows/Find.resx
index 1af7de1..7080a7d 100644
--- a/NBTExplorer/Windows/Find.resx
+++ b/NBTExplorer/Windows/Find.resx
@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>
\ No newline at end of file