diff --git a/BizHawk.MultiClient/tools/RamSearch.cs b/BizHawk.MultiClient/tools/RamSearch.cs
index d57dbbbe59..15dc9fbc66 100644
--- a/BizHawk.MultiClient/tools/RamSearch.cs
+++ b/BizHawk.MultiClient/tools/RamSearch.cs
@@ -21,6 +21,8 @@ namespace BizHawk.MultiClient
         int defaultWidth;       //For saving the default size of the dialog, so the user can restore if desired
         int defaultHeight;
 
+        int hackyPCEStartAddress = 0x1F0000;
+        
         List<Watch> searchList = new List<Watch>();
 
         public RamSearch()
@@ -203,9 +205,13 @@ namespace BizHawk.MultiClient
 
         private void StartNewSearch()
         {
+            int startaddress = 0;
+            if (Global.Emulator.SystemId == "PCE")
+                startaddress = 0x1F0000;    //For now, until Emulator core functionality can better handle a prefix
             for (int x = 0; x < Global.Emulator.MainMemory.Size; x++)
             {
                 searchList.Add(new Watch());
+                searchList[x].address = x + startaddress;
                 searchList[x].value = Global.Emulator.MainMemory.PeekByte(x);
             }
             DisplaySearchList();
@@ -226,7 +232,6 @@ namespace BizHawk.MultiClient
         private void newSearchToolStripMenuItem_Click(object sender, EventArgs e)
         {
             StartNewSearch();
-            
         }
     }
 }
diff --git a/BizHawk.MultiClient/tools/RamWatch.cs b/BizHawk.MultiClient/tools/RamWatch.cs
index 5b54408810..9433bc376f 100644
--- a/BizHawk.MultiClient/tools/RamWatch.cs
+++ b/BizHawk.MultiClient/tools/RamWatch.cs
@@ -21,6 +21,8 @@ namespace BizHawk.MultiClient
         //DWORD display
         //On Movie UP/Down set highlighted items to be what the user had selected (in their new position)
         //DisplayWatches needs to do value display properly like updatevalues, or just run update values
+        //When Watch object has a changes member, display in watch list with a reset changes function
+        //Ability to watch in different memory domains
 
         int defaultWidth;     //For saving the default size of the dialog, so the user can restore if desired
         int defaultHeight;