diff --git a/src/GUI/EFCorePowerTools/Dialogs/CompareOptionsDialog.xaml b/src/GUI/EFCorePowerTools/Dialogs/CompareOptionsDialog.xaml
index 43758b96a..d009e093b 100644
--- a/src/GUI/EFCorePowerTools/Dialogs/CompareOptionsDialog.xaml
+++ b/src/GUI/EFCorePowerTools/Dialogs/CompareOptionsDialog.xaml
@@ -91,6 +91,7 @@
                              Command="{Binding OkCommand}"/>
             <dw:DialogButton Content="{x:Static locale:SharedLocale.Cancel}"
                              Margin="8,0,0,0"
+                             IsCancel="True"
                              Command="{Binding CancelCommand}"/>
         </StackPanel>
     </Grid>
diff --git a/src/GUI/EFCorePowerTools/Dialogs/CompareResultDialog.xaml b/src/GUI/EFCorePowerTools/Dialogs/CompareResultDialog.xaml
index e658adbbc..ec44e22e5 100644
--- a/src/GUI/EFCorePowerTools/Dialogs/CompareResultDialog.xaml
+++ b/src/GUI/EFCorePowerTools/Dialogs/CompareResultDialog.xaml
@@ -126,6 +126,7 @@
         </DataGrid>
         <dw:DialogButton Content="{x:Static locale:CompareLocale.Close}"
                          Grid.Row="2"
+                         IsDefault="True"
                          HorizontalAlignment="Right"
                          Command="{Binding CloseCommand}"
                          Margin="0, 12, 0, 0"></dw:DialogButton>
diff --git a/src/GUI/EFCorePowerTools/Dialogs/EfCoreModelDialog.xaml b/src/GUI/EFCorePowerTools/Dialogs/EfCoreModelDialog.xaml
index 32899afea..23377b48e 100644
--- a/src/GUI/EFCorePowerTools/Dialogs/EfCoreModelDialog.xaml
+++ b/src/GUI/EFCorePowerTools/Dialogs/EfCoreModelDialog.xaml
@@ -194,7 +194,6 @@
             </Label>
             <dw:DialogButton IsTabStop="False"
                              Content="{x:Static locale:ReverseEngineerLocale.Advanced}"
-                             IsDefault="True"
                              Command="{Binding AdvancedCommand}"/>
             <dw:DialogButton TabIndex="20"
                              Content="{x:Static locale:SharedLocale.Ok}"
diff --git a/src/GUI/EFCorePowerTools/Dialogs/PickConfigDialog.xaml b/src/GUI/EFCorePowerTools/Dialogs/PickConfigDialog.xaml
index 30c1a09ea..03b0b25c7 100644
--- a/src/GUI/EFCorePowerTools/Dialogs/PickConfigDialog.xaml
+++ b/src/GUI/EFCorePowerTools/Dialogs/PickConfigDialog.xaml
@@ -84,6 +84,7 @@
             <dw:DialogButton TabIndex="8"
                              Style="{StaticResource SourceSelectionButtonStyle}"
                              Content="{x:Static locale:SharedLocale.Cancel}"
+                             IsCancel="True"
                              Command="{Binding CancelCommand}"/>
         </StackPanel>
     </Grid>
diff --git a/src/GUI/EFCorePowerTools/Dialogs/PickProjectDialog.xaml b/src/GUI/EFCorePowerTools/Dialogs/PickProjectDialog.xaml
index 9777c087f..98ee8ebfd 100644
--- a/src/GUI/EFCorePowerTools/Dialogs/PickProjectDialog.xaml
+++ b/src/GUI/EFCorePowerTools/Dialogs/PickProjectDialog.xaml
@@ -84,6 +84,7 @@
             <dw:DialogButton TabIndex="8"
                              Style="{StaticResource SourceSelectionButtonStyle}"
                              Content="{x:Static locale:SharedLocale.Cancel}"
+                             IsCancel="True"
                              Command="{Binding CancelCommand}"/>
         </StackPanel>
     </Grid>
diff --git a/src/GUI/EFCorePowerTools/Dialogs/PickSchemasDialog.xaml b/src/GUI/EFCorePowerTools/Dialogs/PickSchemasDialog.xaml
index 39d2bc4e3..25aa7930c 100644
--- a/src/GUI/EFCorePowerTools/Dialogs/PickSchemasDialog.xaml
+++ b/src/GUI/EFCorePowerTools/Dialogs/PickSchemasDialog.xaml
@@ -84,6 +84,7 @@
             <dw:DialogButton TabIndex="5"
                              Style="{StaticResource SourceSelectionButtonStyle}"
                              Content="{x:Static locale:SharedLocale.Cancel}"
+                             IsCancel="True"
                              Command="{Binding CancelCommand}"/>
         </StackPanel>
     </Grid>
diff --git a/src/GUI/EFCorePowerTools/Dialogs/PickServerDatabaseDialog.xaml b/src/GUI/EFCorePowerTools/Dialogs/PickServerDatabaseDialog.xaml
index a3e5f1b03..c405193cf 100644
--- a/src/GUI/EFCorePowerTools/Dialogs/PickServerDatabaseDialog.xaml
+++ b/src/GUI/EFCorePowerTools/Dialogs/PickServerDatabaseDialog.xaml
@@ -190,6 +190,7 @@
             <dw:DialogButton TabIndex="8"
                              Style="{StaticResource SourceSelectionButtonStyle}"
                              Content="{x:Static locale:SharedLocale.Cancel}"
+                             IsCancel="True"
                              Command="{Binding CancelCommand}"/>
         </StackPanel>
     </Grid>
diff --git a/test/Ef7Playground/Ef7Playground/Models/NorthwindContext.cs b/test/Ef7Playground/Ef7Playground/Models/NorthwindContext.cs
index c995eb53b..20ccc7c5c 100644
--- a/test/Ef7Playground/Ef7Playground/Models/NorthwindContext.cs
+++ b/test/Ef7Playground/Ef7Playground/Models/NorthwindContext.cs
@@ -88,7 +88,7 @@ public NorthwindContext(DbContextOptions<NorthwindContext> options)
 
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
 #warning To protect potentially sensitive information in your connection string, you should move it out of source code. You can avoid scaffolding the connection string by using the Name= syntax to read it from configuration - see https://go.microsoft.com/fwlink/?linkid=2131148. For more guidance on storing connection strings, see http://go.microsoft.com/fwlink/?LinkId=723263.
-        => optionsBuilder.UseSqlServer("Data Source=.\\SQLEXPRESS;Initial Catalog=Northwind;Integrated Security=True;Encrypt=False;Trust Server Certificate=True;Command Timeout=300", x => x
+        => optionsBuilder.UseSqlServer("Data Source=.\\SQLEXPRESS;Initial Catalog=Northwind;Integrated Security=True;Trust Server Certificate=True;Command Timeout=300", x => x
                 .UseNetTopologySuite()
                 .UseHierarchyId());