diff --git a/plugins/wporg-5ftf/assets/js/frontend.js b/plugins/wporg-5ftf/assets/js/frontend.js
index 5cef190..b8f4054 100644
--- a/plugins/wporg-5ftf/assets/js/frontend.js
+++ b/plugins/wporg-5ftf/assets/js/frontend.js
@@ -93,15 +93,19 @@ jQuery( document ).ready( function( $ ) {
 			},
 			success( response ) {
 				if ( response.message ) {
-					const $message = $( '<div>' )
-						.addClass( 'notice notice-alt' )
-						.addClass( response.success ? 'notice-success' : 'notice-error' )
-						.append( $( '<p>' ).html( response.message ) );
-
-					$( event.target.querySelector( '.message' ) ).html( $message );
+					// Say the message for screen reader users.
+					wp.a11y.speak( response.message );
 
 					if ( response.success ) {
-						$( event.target.querySelector( 'input[type="submit"]' ) ).remove();
+						closeModal();
+						$( button ).after( $( '<p>' ).html( '<em>' + response.message + '<em>' ) );
+					} else {
+						const $message = $( '<div>' )
+							.addClass( 'notice notice-alt' )
+							.addClass( response.success ? 'notice-success' : 'notice-error' )
+							.append( $( '<p>' ).html( response.message ) );
+
+						$( event.target.querySelector( '.message' ) ).html( $message );
 					}
 				}
 			},
diff --git a/plugins/wporg-5ftf/includes/pledge.php b/plugins/wporg-5ftf/includes/pledge.php
index d54cb34..a54af34 100755
--- a/plugins/wporg-5ftf/includes/pledge.php
+++ b/plugins/wporg-5ftf/includes/pledge.php
@@ -270,7 +270,7 @@ function enqueue_assets() {
 
 	if ( CPT_ID === get_post_type() ) {
 		$ver = filemtime( FiveForTheFuture\PATH . '/assets/js/frontend.js' );
-		wp_enqueue_script( '5ftf-frontend', plugins_url( 'assets/js/frontend.js', __DIR__ ), [ 'jquery', 'wp-util', 'wicg-inert' ], $ver, true );
+		wp_enqueue_script( '5ftf-frontend', plugins_url( 'assets/js/frontend.js', __DIR__ ), [ 'jquery', 'wp-a11y', 'wp-util', 'wicg-inert' ], $ver, true );
 
 		$script_data = [
 			'ajaxurl'   => admin_url( 'admin-ajax.php', 'relative' ), // The global ajaxurl is not set on the frontend.
diff --git a/plugins/wporg-5ftf/views/modal-request-manage-link.php b/plugins/wporg-5ftf/views/modal-request-manage-link.php
index e06df4d..ace5eab 100644
--- a/plugins/wporg-5ftf/views/modal-request-manage-link.php
+++ b/plugins/wporg-5ftf/views/modal-request-manage-link.php
@@ -31,7 +31,7 @@ defined( 'WPINC' ) || die();
 				value=""
 			/>
 
-			<div class="message" role="alert" aria-atomic="true"></div>
+			<div class="message"></div>
 
 			<input
 				type="submit"
diff --git a/themes/wporg-5ftf/css/components/_pledge-single.scss b/themes/wporg-5ftf/css/components/_pledge-single.scss
index fc28142..223a6ca 100644
--- a/themes/wporg-5ftf/css/components/_pledge-single.scss
+++ b/themes/wporg-5ftf/css/components/_pledge-single.scss
@@ -63,14 +63,22 @@ body.single.single-5ftf_pledge {
 			}
 		}
 
-		.edit-pledge-wrapper .button {
-			padding-right: 4px;
-			text-decoration: none;
-			color: $color__wp-blue;
-			font-size: 1rem;
+		.edit-pledge-wrapper {
+			text-align: right;
 
-			&:hover {
-				border-bottom: 1px solid currentColor;
+			p {
+				font-size: ms(-2);
+			}
+
+			.button {
+				padding-right: 4px;
+				text-decoration: none;
+				color: $color__wp-blue;
+				font-size: 1rem;
+
+				&:hover {
+					border-bottom: 1px solid currentColor;
+				}
 			}
 		}