diff --git a/SourceGenWPF/WpfGui/DataFileLoadIssue.xaml b/SourceGenWPF/WpfGui/DataFileLoadIssue.xaml
index 93e12f7..b03ed51 100644
--- a/SourceGenWPF/WpfGui/DataFileLoadIssue.xaml
+++ b/SourceGenWPF/WpfGui/DataFileLoadIssue.xaml
@@ -21,11 +21,13 @@ limitations under the License.
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:SourceGenWPF.WpfGui"
         mc:Ignorable="d"
-        Title="Data File Load Issue" ShowInTaskbar="False"
-        Width="570" Height="143" ResizeMode="NoResize" WindowStartupLocation="CenterOwner">
+        Title="Data File Load Issue"
+        SizeToContent="WidthAndHeight" ResizeMode="NoResize"
+        ShowInTaskbar="False" WindowStartupLocation="CenterOwner">
     <DockPanel Margin="8" LastChildFill="False">
         <TextBlock DockPanel.Dock="Top">There was an error while loading the data file:</TextBlock>
-        <TextBox Name="pathNameTextBox" DockPanel.Dock="Top" Margin="0,8,0,0" IsReadOnly="True" MaxLines="1" Text="(filename)"/>
+        <TextBox Name="pathNameTextBox" DockPanel.Dock="Top" Margin="0,8,0,0" IsReadOnly="True"
+                 Width="540" MaxLines="1" Text="(filename)"/>
         <TextBlock Name="problemLabel" DockPanel.Dock="Top" Margin="0,8,0,0" Text="(reason)"/>
         <Grid DockPanel.Dock="Bottom" Margin="0,8,0,0">
             <Grid.ColumnDefinitions>
diff --git a/SourceGenWPF/WpfGui/ProjectLoadIssue.xaml b/SourceGenWPF/WpfGui/ProjectLoadIssue.xaml
index 46f2acf..05944f3 100644
--- a/SourceGenWPF/WpfGui/ProjectLoadIssue.xaml
+++ b/SourceGenWPF/WpfGui/ProjectLoadIssue.xaml
@@ -21,13 +21,14 @@ limitations under the License.
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:SourceGenWPF.WpfGui"
         mc:Ignorable="d"
-        Title="Project Load Issues" ShowInTaskbar="False"
-        Width="570" Height="231" ResizeMode="NoResize" WindowStartupLocation="CenterOwner"
+        Title="Project Load Issues"
+        SizeToContent="WidthAndHeight" ResizeMode="NoResize"
+        ShowInTaskbar="False" WindowStartupLocation="CenterOwner"
         Loaded="ProjectLoadIssues_Loaded">
     <DockPanel LastChildFill="False" Margin="8">
         <TextBlock DockPanel.Dock="Top">Problems were detected while loading the project file:</TextBlock>
-        <TextBox Name="messageTextBox" DockPanel.Dock="Top" Margin="0,8,0,0" Height="107"
-                 IsReadOnly="True" TextWrapping="Wrap" Text=""/>
+        <TextBox Name="messageTextBox" DockPanel.Dock="Top" Margin="0,8,0,0"
+                 Width="540" Height="110" IsReadOnly="True" TextWrapping="Wrap" Text=""/>
         <TextBlock Name="invalidDiscardLabel" DockPanel.Dock="Top" Margin="0,8,0,0" Foreground="Red">
             Invalid data items will be discarded when you save the project.
         </TextBlock>