diff --git a/ElectronicObserver/Window/Wpf/Fleet/FleetView.xaml b/ElectronicObserver/Window/Wpf/Fleet/FleetView.xaml
index 69119bda9..41db3e4b7 100644
--- a/ElectronicObserver/Window/Wpf/Fleet/FleetView.xaml
+++ b/ElectronicObserver/Window/Wpf/Fleet/FleetView.xaml
@@ -190,6 +190,10 @@
 										<ContentControl Grid.Column="2" Content="{Binding Equipment}" />
 									</Grid>
 								</DataTemplate>
+
+								<Style TargetType="TextBlock">
+									<Setter Property="TextWrapping" Value="Wrap" />
+								</Style>
 							</StackPanel.Resources>
 
 							<TextBlock Text="{Binding Name.ToolTip}" />
diff --git a/ElectronicObserver/Window/Wpf/FleetOverview/FleetOverviewView.xaml b/ElectronicObserver/Window/Wpf/FleetOverview/FleetOverviewView.xaml
index aca175406..969cb4903 100644
--- a/ElectronicObserver/Window/Wpf/FleetOverview/FleetOverviewView.xaml
+++ b/ElectronicObserver/Window/Wpf/FleetOverview/FleetOverviewView.xaml
@@ -123,6 +123,10 @@
 											<ContentControl Grid.Column="2" Content="{Binding Equipment}" />
 										</Grid>
 									</DataTemplate>
+
+									<Style TargetType="TextBlock">
+										<Setter Property="TextWrapping" Value="Wrap" />
+									</Style>
 								</StackPanel.Resources>
 
 								<TextBlock Text="{Binding ToolTip}" />