diff --git a/MarkdownMonster/Windows/Favorites/FavoritesControl.xaml b/MarkdownMonster/Windows/Favorites/FavoritesControl.xaml
index f39fe4b0f..09de21cd3 100644
--- a/MarkdownMonster/Windows/Favorites/FavoritesControl.xaml
+++ b/MarkdownMonster/Windows/Favorites/FavoritesControl.xaml
@@ -160,7 +160,9 @@
             </Grid>
 
             <TextBox Text="{Binding EditedFavorite.Title, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"                             
-                     mah:TextBoxHelper.Watermark="Title" Foreground="LightSteelBlue" Name="TextFavoriteTitle"
+                     mah:TextBoxHelper.Watermark="Title" 
+                     mah:TextBoxHelper.SelectAllOnFocus="True"
+                     Foreground="LightSteelBlue" Name="TextFavoriteTitle"
                      FontSize="14"  FontWeight="SemiBold" Margin="5,5,5,3" Width="Auto"/>
             <Grid  Margin="5,3">
                 <Grid.ColumnDefinitions>
@@ -170,13 +172,14 @@
 
                 <TextBox Text="{Binding EditedFavorite.File, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  
                          mah:TextBoxHelper.Watermark="File Name"  
+                         mah:TextBoxHelper.SelectAllOnFocus="True"
                          FontSize="12" FontWeight="Normal" 
                 />
                 <Button Grid.Column="1" Padding="6,0" Margin="3,0,0,0" Click="ButtonFileSelection_Click">...</Button>
             </Grid>
 
             <CheckBox IsChecked="{Binding EditedFavorite.IsFolder}" Content="Is Grouping" 
-                      FontSize="12" FontWeight="Normal" Margin="5,3" />
+                      FontSize="12" FontWeight="Normal" Margin="5,3" Style="{StaticResource CompactCheckBox}" />
 
             <!--<Button Name="ButtonEditComplete" 
                     HorizontalAlignment="Left"
diff --git a/MarkdownMonster/_Classes/AppCommands.cs b/MarkdownMonster/_Classes/AppCommands.cs
index ca81c3514..b18e84916 100644
--- a/MarkdownMonster/_Classes/AppCommands.cs
+++ b/MarkdownMonster/_Classes/AppCommands.cs
@@ -1197,14 +1197,17 @@ void AddFavorite()
                 var control = Model.Window.FavoritesTab.Content as FavoritesControl;
                 var fav = control.FavoritesModel;
 
-                var favorite = fav.AddFavorite(null, new FavoriteItem {File = file} );
+                var display = Path.GetFileNameWithoutExtension(file).Replace("-", " ").Replace("_", " ");
+                display = StringUtils.FromCamelCase(display);
+                    
+                var favorite = fav.AddFavorite(null, new FavoriteItem {File = file, Title = display } );
                 fav.SaveFavorites();
 
                 fav.EditedFavorite = favorite;
                 favorite.DisplayState.IsEditing = true;
+                control.TextFavoriteTitle.Focus();
 
-                Model.Window.Dispatcher.InvokeAsync(() => control.TextFavoriteTitle.Focus(),
-                    System.Windows.Threading.DispatcherPriority.ApplicationIdle);
+                Model.Window.Dispatcher.Delay(900, (p) => control.TextFavoriteTitle.Focus(), null);
 
             }, (p, c) => true);
         }