diff --git a/src/GitHub.App/ViewModels/Dialog/RepositoryCreationViewModel.cs b/src/GitHub.App/ViewModels/Dialog/RepositoryCreationViewModel.cs
index 24b5a7d04c..e31758de75 100644
--- a/src/GitHub.App/ViewModels/Dialog/RepositoryCreationViewModel.cs
+++ b/src/GitHub.App/ViewModels/Dialog/RepositoryCreationViewModel.cs
@@ -90,9 +90,6 @@ public RepositoryCreationViewModel(
                     return parsedReference != repoName ? String.Format(CultureInfo.CurrentCulture, Resources.SafeRepositoryNameWarning, parsedReference) : null;
                 });
 
-            this.WhenAny(x => x.BaseRepositoryPathValidator.ValidationResult, x => x.Value)
-                .Subscribe();
-
             CreateRepository = InitializeCreateRepositoryCommand();
 
             isCreating = CreateRepository.IsExecuting
diff --git a/src/GitHub.VisualStudio.UI/Views/Dialog/RepositoryCreationView.xaml b/src/GitHub.VisualStudio.UI/Views/Dialog/RepositoryCreationView.xaml
index f70229d61e..268db1a692 100644
--- a/src/GitHub.VisualStudio.UI/Views/Dialog/RepositoryCreationView.xaml
+++ b/src/GitHub.VisualStudio.UI/Views/Dialog/RepositoryCreationView.xaml
@@ -84,19 +84,19 @@
           <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
 
-        <Grid.RowDefinitions>
-          <RowDefinition Height="35" />
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="35" />
-          <RowDefinition Height="35" />
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="35" />
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="35" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
 
         <Label Grid.Row="0"
                Grid.Column="0"
@@ -107,17 +107,21 @@
                           Grid.Column="1"
                           MaxLength="{x:Static ghfvs:Constants.MaxRepositoryNameLength}"
                           Text="{Binding RepositoryName, UpdateSourceTrigger=PropertyChanged}" 
-                          SpellCheck.IsEnabled="True"
                           AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.RepositoryNameTextBox}" />
 
                 <StackPanel Grid.Row="1" Grid.Column="1">
-          <ghfvs:ValidationMessage x:Name="nameValidationMessage" ValidatesControl="{Binding ElementName=nameText}" />
+                    <ghfvs:ValidationMessage x:Name="nameValidationMessage"
+                                             Style="{DynamicResource InlineValidationMessage}"
+                                             ValidatesControl="{Binding ElementName=nameText}" 
+                                             ReactiveValidator="{Binding RepositoryNameValidator, Mode=OneWay}"/>
+
           <ghfvs:ValidationMessage x:Name="safeRepositoryNameWarning"
                                   ErrorAdornerTemplate="None"
                                   Fill="#f39c12"
                                   Icon="alert"
                                   Style="{DynamicResource InlineValidationMessage}"
-                                  ValidatesControl="{Binding ElementName=nameText}" />
+                                  ValidatesControl="{Binding ElementName=nameText}" 
+                                  ReactiveValidator="{Binding SafeRepositoryNameWarningValidator, Mode=OneWay}" />
         </StackPanel>
 
         <Label Grid.Row="2"
@@ -162,7 +166,9 @@
         <ghfvs:ValidationMessage x:Name="pathValidationMessage"
                                 Grid.Row="4"
                                 Grid.Column="1"
-                                ValidatesControl="{Binding ElementName=localPathText}" />
+                                Style="{DynamicResource InlineValidationMessage}"
+                                ValidatesControl="{Binding ElementName=localPathText}"
+                                ReactiveValidator="{Binding BaseRepositoryPathValidator, Mode=OneWay}" />
 
         <Label Grid.Row="5"
                Grid.Column="0"