diff --git a/ShareX.HistoryLib/HistoryForm.Designer.cs b/ShareX.HistoryLib/HistoryForm.Designer.cs
index 3c0858081..05305391b 100644
--- a/ShareX.HistoryLib/HistoryForm.Designer.cs
+++ b/ShareX.HistoryLib/HistoryForm.Designer.cs
@@ -97,6 +97,7 @@ private void InitializeComponent()
             // 
             resources.ApplyResources(this.txtFilenameFilter, "txtFilenameFilter");
             this.txtFilenameFilter.Name = "txtFilenameFilter";
+            this.txtFilenameFilter.TextChanged += new System.EventHandler(this.txtFilenameFilter_TextChanged);
             // 
             // cbFilenameFilterMethod
             // 
@@ -253,6 +254,7 @@ private void InitializeComponent()
             // 
             // HistoryForm
             // 
+            this.AcceptButton = this.btnApplyFilters;
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.lvHistory);
diff --git a/ShareX.HistoryLib/HistoryForm.cs b/ShareX.HistoryLib/HistoryForm.cs
index 2002eddcb..37a1bb6ce 100644
--- a/ShareX.HistoryLib/HistoryForm.cs
+++ b/ShareX.HistoryLib/HistoryForm.cs
@@ -330,6 +330,11 @@ private void lvHistory_KeyDown(object sender, KeyEventArgs e)
             e.Handled = true;
         }
 
+        private void txtFilenameFilter_TextChanged(object sender, EventArgs e)
+        {
+            cbFilenameFilter.Checked = txtFilenameFilter.TextLength > 0;
+        }
+
         #endregion Form events
     }
 }
\ No newline at end of file