diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 4082636..3dda3c0 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -1174,6 +1174,13 @@
 	    }
 	}
 
+	/* Check for the next breakpoint after a watchexpression */
+	if (breakpoint != NULL && has_watchexpr())
+	{
+	    *breakpoint = dbg_find_breakpoint(FALSE, fname, sourcing_lnum);
+	    *dbg_tick = debug_tick;
+	}
+
 	/*
 	 * When not inside any ":while" loop, clear remembered lines.
 	 */