diff --git a/NotePad/MainWindow.axaml b/NotePad/MainWindow.axaml
index 66c6abe..b624a4b 100644
--- a/NotePad/MainWindow.axaml
+++ b/NotePad/MainWindow.axaml
@@ -15,7 +15,7 @@
                 <Separator/>
                 <MenuItem Header="E_xit" Click="OnExitClick"/>
             </MenuItem>
-            <MenuItem Header="_Edit">
+            <MenuItem Header="_Edit" x:Name="EditMenuItem">
                 <MenuItem Header="_Undo" Click="OnUndoClick" InputGesture="Ctrl+Z"/>
                 <Separator/>
                 <MenuItem Header="Cu_t" Click="OnCutClick" InputGesture="Ctrl+X"/>
@@ -53,7 +53,8 @@
                      Foreground="Black"
                      CaretBrush="Black"
                      FontFamily="Consolas,Courier New,monospace"
-                     FontSize="12">
+                     FontSize="12"
+                     ClearSelectionOnLostFocus="False">
                 <TextBox.Styles>
                     <Style Selector="TextBox">
                         <Setter Property="Background" Value="White"/>