diff --git a/ShareX.HistoryLib/Forms/HistoryForm.cs b/ShareX.HistoryLib/Forms/HistoryForm.cs
index 07fdad728..d4d5874a6 100644
--- a/ShareX.HistoryLib/Forms/HistoryForm.cs
+++ b/ShareX.HistoryLib/Forms/HistoryForm.cs
@@ -245,6 +245,11 @@ private void AddHistoryItems(HistoryItem[] historyItems)
             lvHistory.FillLastColumn();
             lvHistory.Focus();
 
+            if (lvHistory.Items.Count > 0)
+            {
+                lvHistory.Items[0].Selected = true;
+            }
+
             Cursor = Cursors.Default;
         }
 
@@ -323,8 +328,6 @@ private void HistoryForm_Shown(object sender, EventArgs e)
 
             if (lvHistory.Items.Count > 0)
             {
-                lvHistory.Items[0].Selected = true;
-
                 cbTypeFilterSelection.Items.Clear();
                 cbTypeFilterSelection.Items.AddRange(allHistoryItems.Select(x => x.Type).Distinct().Where(x => !string.IsNullOrEmpty(x)).ToArray());