diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs
index 54f1ab9a5f..7b20ab3490 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs
@@ -86,6 +86,7 @@ namespace BizHawk.Client.EmuHawk
 					else
 					{
 						NotesBox.Text = Watches[0].Notes;
+						NotesBox.Select();
 						AddressBox.SetFromLong(Watches[0].Address);
 					}