diff --git a/Flow.Launcher.Plugin/Result.cs b/Flow.Launcher.Plugin/Result.cs
index 1894e0eda..78fa31974 100644
--- a/Flow.Launcher.Plugin/Result.cs
+++ b/Flow.Launcher.Plugin/Result.cs
@@ -10,7 +10,7 @@ namespace Flow.Launcher.Plugin
 {
     /// <summary>
     /// Describes a result of a <see cref="Query"/> executed by a plugin.
-    /// This or its child classses is serializable.
+    /// This or its child classes is serializable.
     /// </summary>
     public class Result
     {
diff --git a/Flow.Launcher/Storage/LastOpenedHistoryResult.cs b/Flow.Launcher/Storage/LastOpenedHistoryResult.cs
index 51fba5849..032d24498 100644
--- a/Flow.Launcher/Storage/LastOpenedHistoryResult.cs
+++ b/Flow.Launcher/Storage/LastOpenedHistoryResult.cs
@@ -18,17 +18,15 @@ public class LastOpenedHistoryResult : Result
     public string Query { get; set; } = string.Empty;
     
     /// <summary>
-    /// The UTC date and time when this result was executed/opened.
+    /// The local date and time when this result was executed/opened.
     /// </summary>
     public DateTime ExecutedDateTime { get; set; }
 
     /// <summary>
     /// Initializes a new instance of <see cref="LastOpenedHistoryResult"/>.
-    /// Sets <see cref="OriginQuery"/> using the current <see cref="Query"/> value, because OriginQuery is not serialized.
     /// </summary>
     public LastOpenedHistoryResult()
     {
-        this.OriginQuery = new Query { TrimmedQuery = Query };
     }
 
     /// <summary>
diff --git a/Flow.Launcher/Storage/QueryHistory.cs b/Flow.Launcher/Storage/QueryHistory.cs
index 015b33399..21e78f8c7 100644
--- a/Flow.Launcher/Storage/QueryHistory.cs
+++ b/Flow.Launcher/Storage/QueryHistory.cs
@@ -25,7 +25,7 @@ namespace Flow.Launcher.Storage
         /// <see cref="LastOpenedHistoryResult"/> format and append them to
         /// <see cref="LastOpenedHistoryItems"/>.
         /// </summary>
-        [Obsolete("For backwards comaptibility. Remove after release v2.3.0")]
+        [Obsolete("For backwards compatibility. Remove after release v2.3.0")]
         public void PopulateHistoryFromLegacyHistory()
         {
             if (Items.Count == 0) return;
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 7c0cadb67..e91533dfe 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -356,8 +356,11 @@ namespace Flow.Launcher.ViewModel
             {
                 SelectedResults = History;
 
-                SelectedResults.SelectedIndex = 0;
-                SelectedResults.SelectedItem = SelectedResults.Results[0];
+                if (SelectedResults.Results.Count > 0)
+                {
+                    SelectedResults.SelectedIndex = 0;
+                    SelectedResults.SelectedItem = SelectedResults.Results[0];
+                }
             }
             else
             {