diff --git a/modules/modifier.js b/modules/modifier.js
index 80fa0e4f9..349e70b8b 100644
--- a/modules/modifier.js
+++ b/modules/modifier.js
@@ -91,6 +91,11 @@ function addListItem( comment ) {
 	desiredLevel = comment.level + 1;
 	target = curComment.range.endContainer;
 
+	// HACK: Skip past our own reply buttons
+	if ( target.nextSibling && target.nextSibling.className && target.nextSibling.className.indexOf( 'dt-init-replylink-buttons' ) !== -1 ) {
+		target = target.nextSibling;
+	}
+
 	// target is a text node or an inline element at the end of a "paragraph" (not necessarily paragraph node).
 	// First, we need to find a block-level parent that we can mess with.
 	// If we can't find a surrounding list item or paragraph (e.g. maybe we're inside a table cell