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 5070b94..feceeb4 100644
--- a/src/wp-admin/includes/class-wp-comments-list-table.php
+++ b/src/wp-admin/includes/class-wp-comments-list-table.php
@@ -635,7 +635,7 @@ if ( ( 'spam' === $comment_status || 'trash' === $comment_status ) && current_us
 		if ( 'spam' !== $the_comment_status && 'trash' !== $the_comment_status ) {
 			$actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' aria-label='" . esc_attr__( 'Edit this comment' ) . "'>" . __( 'Edit' ) . '</a>';
 
-			$format = '<a data-comment-id="%d" data-post-id="%d" data-action="%s" class="%s" aria-label="%s" href="#">%s</a>';
+			$format = '<button data-comment-id="%d" data-post-id="%d" data-action="%s" class="%s button-link" role="button" aria-expanded="false" aria-label="%s">%s</button>';
 
 			$actions['quickedit'] = sprintf( $format, $comment->comment_ID, $comment->comment_post_ID, 'edit', 'vim-q comment-inline', esc_attr__( 'Quick edit this comment inline' ), __( 'Quick&nbsp;Edit' ) );
 
diff --git a/src/wp-admin/js/edit-comments.js b/src/wp-admin/js/edit-comments.js
index b9a9f2c..795f2f8 100644
--- a/src/wp-admin/js/edit-comments.js
+++ b/src/wp-admin/js/edit-comments.js
@@ -578,7 +578,10 @@ commentReply = {
 	init : function() {
 		var row = $('#replyrow');
 
-		$('a.cancel', row).click(function() { return commentReply.revert(); });
+		$('a.cancel', row).click(function() { 
+			$( '.comment-inline' ).attr( 'aria-expanded', 'false' );
+			return commentReply.revert(); 
+		});
 		$('a.save', row).click(function() { return commentReply.send(); });
 		$( 'input#author-name, input#author-email, input#author-url', row ).keypress( function( e ) {
 			if ( e.which == 13 ) {
@@ -962,6 +965,7 @@ $(document).ready(function(){
 	// Quick Edit and Reply have an inline comment editor.
 	$( '#the-comment-list' ).on( 'click', '.comment-inline', function (e) {
 		e.preventDefault();
+		$( this ).attr( 'aria-expanded', 'true' );
 		var $el = $( this ),
 			action = 'replyto';