diff --git a/GUI.NET/Debugger/Controls/ctrlNametableViewer.cs b/GUI.NET/Debugger/Controls/ctrlNametableViewer.cs
index adfc60fa..a6eb1c7a 100644
--- a/GUI.NET/Debugger/Controls/ctrlNametableViewer.cs
+++ b/GUI.NET/Debugger/Controls/ctrlNametableViewer.cs
@@ -577,7 +577,7 @@ namespace Mesen.GUI.Debugger.Controls
 
 		private void mnuEditInMemoryViewer_Click(object sender, EventArgs e)
 		{
-			DebugWindowManager.OpenMemoryViewer(_currentPpuAddress, DebugMemoryType.PpuMemory);
+			DebugWindowManager.OpenMemoryViewer(_tileInfo.PpuAddress, DebugMemoryType.PpuMemory);
 		}
 
 		private void mnuToggleBreakpoint_Click(object sender, EventArgs e)
@@ -586,7 +586,7 @@ namespace Mesen.GUI.Debugger.Controls
 				return;
 			}
 
-			PpuAddressTypeInfo addressInfo = InteropEmu.DebugGetPpuAbsoluteAddressAndType((uint)_currentPpuAddress);
+			PpuAddressTypeInfo addressInfo = InteropEmu.DebugGetPpuAbsoluteAddressAndType((uint)_tileInfo.PpuAddress);
 
 			BreakpointManager.EditBreakpoint(new Breakpoint() {
 				MemoryType = addressInfo.Type.ToMemoryType(),