diff --git a/src/wp-admin/includes/class-wp-comments-list-table.php b/src/wp-admin/includes/class-wp-comments-list-table.php
index 08b709b633..f9cde7ecf5 100644
--- a/src/wp-admin/includes/class-wp-comments-list-table.php
+++ b/src/wp-admin/includes/class-wp-comments-list-table.php
@@ -460,8 +460,12 @@ class WP_Comments_List_Table extends WP_List_Table {
 
 			if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) {
 				$actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . esc_attr__( 'Edit comment' ) . "'>". __( 'Edit' ) . '</a>';
-				$actions['quickedit'] = '<a onclick="window.commentReply && commentReply.open( \''.$comment->comment_ID.'\',\''.$post->ID.'\',\'edit\' );return false;" class="vim-q" title="'.esc_attr__( 'Quick Edit' ).'" href="#">' . __( 'Quick&nbsp;Edit' ) . '</a>';
-				$actions['reply'] = '<a onclick="window.commentReply && commentReply.open( \''.$comment->comment_ID.'\',\''.$post->ID.'\' );return false;" class="vim-r" title="'.esc_attr__( 'Reply to this comment' ).'" href="#">' . __( 'Reply' ) . '</a>';
+
+				$format = '<a data-comment-id="%d" data-post-id="%d" class="%s" title="%s" href="#">%s</a>';
+
+				$actions['quickedit'] = sprintf( $format, $comment->comment_ID, $post->ID, 'vim-q edit-comment-inline', esc_attr__( 'Quick Edit' ), __( 'Quick Edit' ) );
+
+				$actions['reply'] = sprintf( $format, $comment->comment_ID, $post->ID, 'vim-r reply-comment-inline', esc_attr__( 'Reply to this comment' ), __( 'Reply' ) );
 			}
 
 			/** This filter is documented in wp-admin/includes/dashboard.php */
diff --git a/src/wp-admin/js/edit-comments.js b/src/wp-admin/js/edit-comments.js
index ff149e19dc..d8a402ecd6 100644
--- a/src/wp-admin/js/edit-comments.js
+++ b/src/wp-admin/js/edit-comments.js
@@ -607,6 +607,25 @@ $(document).ready(function(){
 			}
 		);
 	}
+
+	if ( typeof commentReply != 'undefined' ) {
+
+		// Each "Quick Edit" link, open the comment editor
+		$( 'body' ).on( 'click', '.comment .row-actions .quickedit .edit-comment-inline', function (e) {
+			e.preventDefault();
+
+			var $el = $( e.currentTarget );
+			commentReply.open( $el.data( 'comment-id' ), $el.data( 'post-id' ), 'edit' );
+		} );
+
+		// Each "Reply" link, open the comment reply
+		$( 'body' ).on( 'click', '.comment .row-actions .reply .reply-comment-inline', function (e) {
+			e.preventDefault();
+
+			var $el = $( e.currentTarget );
+			commentReply.open( $el.data('comment-id'), $el.data('post-id') );
+		} );
+	}
 });
 
 })(jQuery);