diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 4ca03d5669..e4ca2450b8 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -684,6 +684,10 @@ Change const BufferView::getCurrentChange() const
 		return Change(Change::UNCHANGED);
 
 	DocIterator dit = d->cursor_.selectionBegin();
+	// The selected content might have been changed (see #7685)
+	while (dit.inMathed())
+		// Find enclosing text cursor
+		dit.pop_back();
 	return dit.paragraph().lookupChange(dit.pos());
 }
 
diff --git a/status.20x b/status.20x
index 46ca79d578..94728a4522 100644
--- a/status.20x
+++ b/status.20x
@@ -88,6 +88,9 @@ What's new
 
 - Fix crash when navigating to next change (bug 8684).
 
+- Fix crash when entering math in change-tracking mode while merge changes
+  dialog is open (bug 7685).
+
 - Fix crash when optional argument inside a math macro was deleted
   (bug 8329).