diff --git a/src/drivers/sdl/ramwatch.cpp b/src/drivers/sdl/ramwatch.cpp
index 04797d24..e82684fb 100644
--- a/src/drivers/sdl/ramwatch.cpp
+++ b/src/drivers/sdl/ramwatch.cpp
@@ -936,6 +936,8 @@ static void ramWatch_cell_edited_cb (GtkCellRendererText * cell,
 
 	if ( rw == NULL )
 	{
+		rww->ramWatchEditRowIdx = -1;
+		rww->ramWatchEditColIdx = -1;
 		return;
 	}