diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e25821..1c3495f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ Recommended Gamevault Server Version: `v10.0.1`
 - Bug fix: Standard release date filters did not work if no release year was set in existing games
 - Bug fix: If the profile picture of another user has been changed, the profile picture has been changed in the top left-hand corner.
 - Bug fix: Game Type is now displayed in more user friendly values
+- Bug fix: Crash when searching in the installed games search bar while the list was empty
 
 ## 1.8.0
 Recommended Gamevault Server Version: `v10.0.0`
diff --git a/gamevault/UserControls/NewGameViewUserControl.xaml.cs b/gamevault/UserControls/NewGameViewUserControl.xaml.cs
index 694e8cd..eea9fac 100644
--- a/gamevault/UserControls/NewGameViewUserControl.xaml.cs
+++ b/gamevault/UserControls/NewGameViewUserControl.xaml.cs
@@ -95,6 +95,11 @@ private void GamePlay_Click(object sender, MouseButtonEventArgs e)
             {
                 path = result.Value;
             }
+            if(!File.Exists($"{path}\\gamevault-exec"))
+            {
+                MainWindowViewModel.Instance.AppBarText = $"Can not find part of '{path}'";
+                return;
+            }
             string savedExecutable = Preferences.Get(AppConfigKey.Executable, $"{path}\\gamevault-exec");
             string parameter = Preferences.Get(AppConfigKey.LaunchParameter, $"{path}\\gamevault-exec");
             if (savedExecutable == string.Empty)
diff --git a/gamevault/UserControls/NewInstallUserControl.xaml.cs b/gamevault/UserControls/NewInstallUserControl.xaml.cs
index 59acaf1..0b2a438 100644
--- a/gamevault/UserControls/NewInstallUserControl.xaml.cs
+++ b/gamevault/UserControls/NewInstallUserControl.xaml.cs
@@ -259,6 +259,7 @@ private void Search_TextChanged(object sender, TextChangedEventArgs e)
         private void InputTimerElapsed(object sender, EventArgs e)
         {
             inputTimer.Stop();
+            if (NewInstallViewModel.Instance.InstalledGamesFilter == null) return;
             NewInstallViewModel.Instance.InstalledGamesFilter.Filter = item =>
             {
                 return ((KeyValuePair<Game, string>)item).Key.Title.Contains(inputTimer.Data, StringComparison.OrdinalIgnoreCase);