diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs
index 7c7b9a5..edfbb34 100644
--- a/src/BreCalClient/MainWindow.xaml.cs
+++ b/src/BreCalClient/MainWindow.xaml.cs
@@ -450,7 +450,7 @@ namespace BreCalClient
 
             if(!string.IsNullOrEmpty(sfm.SearchString))
             {
-                this._visibleControlModels.RemoveAll(x => !x.ContainsRemarkText(sfm.SearchString));
+                this._visibleControlModels.RemoveAll(x => !(x.ContainsRemarkText(sfm.SearchString) || (x.Ship?.Name.Contains(sfm.SearchString, StringComparison.InvariantCultureIgnoreCase) ?? false)));
             }
 
             if(sfm.ShipLengthTo != null)