diff --git a/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs
index 743bb1eb0..d70dd0513 100644
--- a/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs
@@ -193,6 +193,14 @@ partial void OnGlobalSearchTextChanged(string value)
             UpdateSettingsSuggestions(value);
     }
 
+    public void ClearAllSearchQueries()
+    {
+        DiscoverPage.ViewModel.ClearSearchQuery();
+        UpdatesPage.ViewModel.ClearSearchQuery();
+        InstalledPage.ViewModel.ClearSearchQuery();
+        GlobalSearchText = "";
+    }
+
     // ─── Settings search suggestions ───────────────────────────────────────────
     public ObservableCollection<SettingsSearchResult> SettingsSuggestions { get; } = new();
 
diff --git a/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs
index d5e7cff80..20a8d09fc 100644
--- a/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs
@@ -500,6 +500,14 @@ partial void OnGlobalQueryTextChanged(string value)
             FilterPackages();
     }
 
+    public void ClearSearchQuery()
+    {
+        QueryBackup = "";
+        if (string.IsNullOrEmpty(GlobalQueryText)) return;
+        GlobalQueryText = "";
+        if (!MegaQueryBoxEnabled) FilterPackages();
+    }
+
     [RelayCommand]
     public void SubmitSearch()
     {
diff --git a/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs b/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
index 764326106..de72d4e18 100644
--- a/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
@@ -187,6 +187,7 @@ protected override void OnClosing(WindowClosingEventArgs e)
         if (!_allowClose && (OperatingSystem.IsMacOS() || !Settings.Get(Settings.K.DisableSystemTray)))
         {
             e.Cancel = true;
+            ViewModel.ClearAllSearchQueries();
             Hide();
             return;
         }