diff --git a/Bloxstrap/UI/Elements/Menu/Pages/FastFlagEditorPage.xaml b/Bloxstrap/UI/Elements/Menu/Pages/FastFlagEditorPage.xaml
index 48fdf10..6d730c9 100644
--- a/Bloxstrap/UI/Elements/Menu/Pages/FastFlagEditorPage.xaml
+++ b/Bloxstrap/UI/Elements/Menu/Pages/FastFlagEditorPage.xaml
@@ -16,7 +16,7 @@
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         
-        <TextBlock Grid.Row="0" Margin="0,0,0,16" Text="Manage your own FastFlags. Press the delete key to delete a selected entry." FontSize="14" Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
+        <TextBlock Grid.Row="0" Margin="0,0,0,16" Text="Manage your own FastFlags. Double click the value column to edit." FontSize="14" Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
 
         <DataGrid Name="DataGrid" Grid.Row="1" Style="{x:Null}" HeadersVisibility="Column" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" CellEditEnding="DataGrid_CellEditEnding">
             <DataGrid.Columns>
diff --git a/Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml.cs b/Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml.cs
index 9ea4c96..ee3c53e 100644
--- a/Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml.cs
+++ b/Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml.cs
@@ -10,14 +10,24 @@ namespace Bloxstrap.UI.Elements.Menu.Pages
     /// </summary>
     public partial class FastFlagsPage
     {
+        bool _initialLoad = false;
+
         public FastFlagsPage()
         {
+            DataContext = new FastFlagsViewModel();
             InitializeComponent();
         }
 
         private void Page_Loaded(object sender, RoutedEventArgs e)
         {
             // refresh datacontext on page load to synchronize with editor page
+            
+            if (!_initialLoad)
+            {
+                _initialLoad = true;
+                return;
+            }
+
             DataContext = new FastFlagsViewModel();
         }