diff --git a/ShareX.HistoryLib/Forms/HistoryForm.cs b/ShareX.HistoryLib/Forms/HistoryForm.cs
index 415350098..947406f29 100644
--- a/ShareX.HistoryLib/Forms/HistoryForm.cs
+++ b/ShareX.HistoryLib/Forms/HistoryForm.cs
@@ -170,8 +170,14 @@ private void ApplyFilter(HistoryFilter filter)
                 UpdateTitle(filteredHistoryItems);
 
                 listViewCache = null;
+                listViewFirstItem = 0;
                 lvHistory.VirtualListSize = 0;
-                lvHistory.VirtualListSize = filteredHistoryItems.Length;
+
+                if (filteredHistoryItems.Length > 0)
+                {
+                    lvHistory.VirtualListSize = filteredHistoryItems.Length;
+                    lvHistory.SelectedIndices.Add(0);
+                }
             }
         }
 
@@ -241,7 +247,7 @@ private ListViewItem CreateListViewItem(int index)
                 lvi.ImageIndex = 3;
             }
 
-            lvi.SubItems.Add(hi.DateTime.ToString()).Tag = hi.DateTime;
+            lvi.SubItems.Add(hi.DateTime.ToString());
             lvi.SubItems.Add(hi.FileName);
             lvi.SubItems.Add(hi.URL);
             lvi.Tag = hi;