diff --git a/AssetStudioGUI/AssetStudioGUIForm.Designer.cs b/AssetStudioGUI/AssetStudioGUIForm.Designer.cs
index 8f4547f..6497581 100644
--- a/AssetStudioGUI/AssetStudioGUIForm.Designer.cs
+++ b/AssetStudioGUI/AssetStudioGUIForm.Designer.cs
@@ -723,7 +723,9 @@
             this.listSearchHistory.Size = new System.Drawing.Size(351, 21);
             this.listSearchHistory.TabIndex = 2;
             this.listSearchHistory.TabStop = false;
-            this.listSearchHistory.TextChanged += new System.EventHandler(this.listSearchHistory_TextChanged);
+            this.listSearchHistory.SelectedIndexChanged += new System.EventHandler(this.listSearchHistory_SelectedIndexChanged);
+            this.listSearchHistory.Enter += new System.EventHandler(this.listSearch_Enter);
+            this.listSearchHistory.Leave += new System.EventHandler(this.listSearch_Leave);
             // 
             // listSearchFilterMode
             // 
diff --git a/AssetStudioGUI/AssetStudioGUIForm.cs b/AssetStudioGUI/AssetStudioGUIForm.cs
index 8a5615d..1f8dcc3 100644
--- a/AssetStudioGUI/AssetStudioGUIForm.cs
+++ b/AssetStudioGUI/AssetStudioGUIForm.cs
@@ -657,7 +657,7 @@ namespace AssetStudioGUI
         {
             BeginInvoke(new Action(() =>
             {
-                if (listSearch.Text != "")
+                if (listSearch.Text != "" && listSearch.Text != " Filter ")
                 {
                     if (listSearchHistory.Items.Count == listSearchHistory.MaxDropDownItems)
                     {
@@ -1867,7 +1867,7 @@ namespace AssetStudioGUI
             }
         }
 
-        private void listSearchHistory_TextChanged(object sender, EventArgs e)
+        private void listSearchHistory_SelectedIndexChanged(object sender, EventArgs e)
         {
             listSearch.Text = listSearchHistory.Text;
             listSearch.Focus();