diff --git a/Sledgemapper/Sledgemapper.cs b/Sledgemapper/Sledgemapper.cs
index c07bcde..4795e72 100644
--- a/Sledgemapper/Sledgemapper.cs
+++ b/Sledgemapper/Sledgemapper.cs
@@ -200,6 +200,7 @@ namespace Sledgemapper
 
             window.Content = noteWindow;
             window.ShowModal(_desktop);
+            noteWindow.NoteText.SetKeyboardFocus();
         }
 
         protected override void Update(GameTime gameTime)
@@ -1126,6 +1127,7 @@ namespace Sledgemapper
             noteWindow.BtnCancel.Click += OnButtonNoteCancelClick;
             window.Content = noteWindow;
             window.ShowModal(_desktop);
+            noteWindow.NoteText.SetKeyboardFocus();
         }
 
         private void OnContextMenuDeleteNoteClick(object sender, EventArgs e)