diff --git a/ModernKeePass/Actions/NavigateToUrlAction.cs b/ModernKeePass/Actions/NavigateToUrlAction.cs
index ecd4b6c..e5f95bc 100644
--- a/ModernKeePass/Actions/NavigateToUrlAction.cs
+++ b/ModernKeePass/Actions/NavigateToUrlAction.cs
@@ -25,7 +25,7 @@ namespace ModernKeePass.Actions
             }
             catch (Exception ex)
             {
-                MessageDialogHelper.ShowErrorDialog(ex).Wait();
+                MessageDialogHelper.ShowErrorDialog(ex).GetAwaiter();
                 return false;
             }
         }
diff --git a/ModernKeePass/Views/EntryDetailPage.xaml b/ModernKeePass/Views/EntryDetailPage.xaml
index 84df15b..2563dd7 100644
--- a/ModernKeePass/Views/EntryDetailPage.xaml
+++ b/ModernKeePass/Views/EntryDetailPage.xaml
@@ -516,7 +516,9 @@
                     Text="{Binding Name, Mode=TwoWay}" 
                     Foreground="{ThemeResource DefaultTextForegroundThemeBrush}"
                     Background="Transparent"
-                    IsHitTestVisible="{Binding IsEditMode}" 
+                    SelectionHighlightColor="{StaticResource MainColor}"
+                    IsHitTestVisible="{Binding IsEditMode}"
+                    IsEnabled="{Binding IsSelected}"
                     BorderThickness="0" 
                     FontSize="20"
                     FontWeight="SemiBold"
diff --git a/ModernKeePass/Views/EntryDetailPage.xaml.cs b/ModernKeePass/Views/EntryDetailPage.xaml.cs
index 724a44c..9c73dbe 100644
--- a/ModernKeePass/Views/EntryDetailPage.xaml.cs
+++ b/ModernKeePass/Views/EntryDetailPage.xaml.cs
@@ -63,17 +63,16 @@ namespace ModernKeePass.Views
         private void HamburgerMenuUserControl_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             var listView = sender as ListView;
-            EntryVm entry;
             switch (listView?.SelectedIndex)
             {
                 case -1:
                     return;
                 default:
-                    entry = listView?.SelectedItem as EntryVm;
+                    var entry = listView?.SelectedItem as EntryVm;
+                    StackPanel.DataContext = entry;
+                    TitleTextBox.DataContext = entry;
                     break;
             }
-
-            StackPanel.DataContext = entry;
         }
     }
 }
diff --git a/ModernKeePass/Views/GroupDetailPage.xaml b/ModernKeePass/Views/GroupDetailPage.xaml
index 290e943..faa22c4 100644
--- a/ModernKeePass/Views/GroupDetailPage.xaml
+++ b/ModernKeePass/Views/GroupDetailPage.xaml
@@ -239,6 +239,7 @@
                     x:Name="TitleTextBox"
                     Text="{Binding Name, Mode=TwoWay}" 
                     Foreground="{ThemeResource DefaultTextForegroundThemeBrush}"
+                    SelectionHighlightColor="{StaticResource MainColor}"
                     Background="Transparent"
                     IsHitTestVisible="{Binding IsEditMode}" 
                     BorderThickness="0" 
diff --git a/ModernKeePass/Views/GroupDetailPage.xaml.cs b/ModernKeePass/Views/GroupDetailPage.xaml.cs
index fd66786..a8cac34 100644
--- a/ModernKeePass/Views/GroupDetailPage.xaml.cs
+++ b/ModernKeePass/Views/GroupDetailPage.xaml.cs
@@ -71,30 +71,28 @@ namespace ModernKeePass.Views
         private void groups_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             var listView = sender as ListView;
-            GroupVm group;
             switch (listView?.SelectedIndex)
             {
                 case -1:
                     return;
                 default:
-                    group = listView?.SelectedItem as GroupVm;
+                    var group = listView?.SelectedItem as GroupVm;
+                    Frame.Navigate(typeof(GroupDetailPage), group);
                     break;
             }
-            Frame.Navigate(typeof(GroupDetailPage), group);
         }
         
         private void entries_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            EntryVm entry;
             switch (GridView.SelectedIndex)
             {
                 case -1:
                     return;
                 default:
-                    entry = GridView.SelectedItem as EntryVm;
+                    var entry = GridView.SelectedItem as EntryVm;
+                    Frame.Navigate(typeof(EntryDetailPage), entry);
                     break;
             }
-            Frame.Navigate(typeof(EntryDetailPage), entry);
         }
         
         private void SemanticZoom_ViewChangeStarted(object sender, SemanticZoomViewChangedEventArgs e)