diff --git a/packages/block-library/src/button/edit.js b/packages/block-library/src/button/edit.js
index 487c6194df0d7..2136f5ddc6b24 100644
--- a/packages/block-library/src/button/edit.js
+++ b/packages/block-library/src/button/edit.js
@@ -237,7 +237,7 @@ function ButtonEdit( props ) {
 			<div
 				{ ...blockProps }
 				className={ classnames( blockProps.className, {
-					[ `wp-block-button__width-${ width }` ]: width,
+					[ `has-custom-width wp-block-button__width-${ width }` ]: width,
 				} ) }
 			>
 				<RichText
diff --git a/packages/block-library/src/button/style.scss b/packages/block-library/src/button/style.scss
index f9c5250ac8987..ef6983f6bf277 100644
--- a/packages/block-library/src/button/style.scss
+++ b/packages/block-library/src/button/style.scss
@@ -34,32 +34,27 @@ $blocks-button__height: 3.1em;
 }
 
 .wp-block-button {
-	&.wp-block-button__width-25 {
-		width: 25%;
+	&.has-custom-width {
+		max-width: none;
 		.wp-block-button__link {
 			width: 100%;
 		}
 	}
 
+	&.wp-block-button__width-25 {
+		width: 25%;
+	}
+
 	&.wp-block-button__width-50 {
 		width: 50%;
-		.wp-block-button__link {
-			width: 100%;
-		}
 	}
 
 	&.wp-block-button__width-75 {
 		width: 75%;
-		.wp-block-button__link {
-			width: 100%;
-		}
 	}
 
 	&.wp-block-button__width-100 {
 		width: 100%;
-		.wp-block-button__link {
-			width: 100%;
-		}
 	}
 }