diff --git a/projects/plugins/jetpack/_inc/client/security/style.scss b/projects/plugins/jetpack/_inc/client/security/style.scss
index 283339ed6c68a..9a4608ee3bf57 100644
--- a/projects/plugins/jetpack/_inc/client/security/style.scss
+++ b/projects/plugins/jetpack/_inc/client/security/style.scss
@@ -38,6 +38,7 @@
 	}
 
 	&__ips {
+		width: 100%;
 		margin-left: 64px;
 
 		&__button-container {
@@ -50,6 +51,7 @@
 	
 		&__save-button {
 			margin-top: 0.5rem;
+			float: right;
 		}
 	}
 
diff --git a/projects/plugins/jetpack/_inc/client/security/waf.jsx b/projects/plugins/jetpack/_inc/client/security/waf.jsx
index 2d602c93c6b5c..1bd7646c98d62 100644
--- a/projects/plugins/jetpack/_inc/client/security/waf.jsx
+++ b/projects/plugins/jetpack/_inc/client/security/waf.jsx
@@ -422,39 +422,43 @@ export const Waf = class extends Component {
 						</span>
 					}
 				/>
-				<div className="waf__settings__ips">
-					<Textarea
-						disabled={
-							baseInputDisabledCase ||
-							this.props.isUpdatingWafSettings ||
-							! this.props.settings?.ipBlockListEnabled
-						}
-						name="ipBlockList"
-						placeholder={ sprintf(
-							/* translators: Placeholder is a list of example IP addresses. */
-							__( 'Example: %s', 'jetpack' ),
-							'\n12.12.12.1\n12.12.12.2'
+				{ ( this.state.ipBlockListEnabled || !! this.state.ipBlockList ) && (
+					<div className="waf__settings__ips">
+						<Textarea
+							disabled={
+								baseInputDisabledCase ||
+								this.props.isUpdatingWafSettings ||
+								! this.props.settings?.ipBlockListEnabled
+							}
+							name="ipBlockList"
+							placeholder={ sprintf(
+								/* translators: Placeholder is a list of example IP addresses. */
+								__( 'Example: %s', 'jetpack' ),
+								'\n12.12.12.1\n12.12.12.2'
+							) }
+							value={ this.state.ipBlockList }
+							onChange={ this.handleIpBlockListChange }
+						/>
+						{ this.state.ipBlockListEnabled && (
+							<Button
+								primary
+								rna
+								compact
+								type="button"
+								className="waf__settings__ips__save-button"
+								disabled={
+									baseInputDisabledCase ||
+									this.state.ipBlockList === this.props.settings?.ipBlockList ||
+									( this.props.isUpdatingWafSettings &&
+										this.state.ipBlockList !== this.props.settings?.ipBlockList )
+								}
+								onClick={ this.onSubmit }
+							>
+								{ __( 'Save block list', 'jetpack' ) }
+							</Button>
 						) }
-						value={ this.state.ipBlockList }
-						onChange={ this.handleIpBlockListChange }
-					/>
-					<Button
-						primary
-						rna
-						compact
-						type="button"
-						className="waf__settings__ips__save-button"
-						disabled={
-							baseInputDisabledCase ||
-							this.state.ipBlockList === this.props.settings?.ipBlockList ||
-							( this.props.isUpdatingWafSettings &&
-								this.state.ipBlockList !== this.props.settings?.ipBlockList )
-						}
-						onClick={ this.onSubmit }
-					>
-						{ __( 'Save block list', 'jetpack' ) }
-					</Button>
-				</div>
+					</div>
+				) }
 			</div>
 		);