diff --git a/BizHawk.MultiClient/RamWatch.cs b/BizHawk.MultiClient/RamWatch.cs
index 5621f6c2f5..abceebbf58 100644
--- a/BizHawk.MultiClient/RamWatch.cs
+++ b/BizHawk.MultiClient/RamWatch.cs
@@ -172,6 +172,19 @@ namespace BizHawk.MultiClient
 
         void EditWatch()
         {
+            ListView.SelectedIndexCollection indexes = WatchListView.SelectedIndices;
+            RamWatchNewWatch r = new RamWatchNewWatch();
+            int x = indexes[0];
+            r.SetToEditWatch( watchList[x] );
+            r.ShowDialog();
+
+            if (r.userSelected == true)
+            {
+                //TODO: check if edited watch is an exact duplicate and prevent?
+                //TODO: changes have been made, flag it
+                watchList[x] = r.watch;
+                DisplayWatchList();
+            }
         }
 
         void RemoveWatch()
diff --git a/BizHawk.MultiClient/RamWatchNewWatch.cs b/BizHawk.MultiClient/RamWatchNewWatch.cs
index 43b83f9bb8..367018f2ca 100644
--- a/BizHawk.MultiClient/RamWatchNewWatch.cs
+++ b/BizHawk.MultiClient/RamWatchNewWatch.cs
@@ -20,7 +20,7 @@ namespace BizHawk.MultiClient
             InitializeComponent();
         }
 
-        public void SetEditToEditWatch(Watch w)
+        public void SetToEditWatch(Watch w)
         {
             //Sets this dialog to Edit Watch and receives default values
             this.Text = "Edit Watch";