diff --git a/aegisub/src/command/edit.cpp b/aegisub/src/command/edit.cpp
index 0ed360792..bce900c32 100644
--- a/aegisub/src/command/edit.cpp
+++ b/aegisub/src/command/edit.cpp
@@ -242,7 +242,7 @@ static void combine_lines(agi::Context *c, void (*combiner)(AssDialogue *, AssDi
 
 		combiner(first, diag);
 
-		first->End = diag->End;
+		first->End = std::max(first->End, diag->End);
 		delete diag;
 	}