diff --git a/classes/views/styles/_buttons.php b/classes/views/styles/_buttons.php
index 6337b46a18..6ceb11d317 100644
--- a/classes/views/styles/_buttons.php
+++ b/classes/views/styles/_buttons.php
@@ -53,7 +53,8 @@ class="frm-style-item-heading"><?php esc_html_e( 'Font Color', 'formidable' ); ?
 
 					<div class="frm5 frm_form_field">
 						<label
-							for="frm_submit_font_size-value"
+							data-slider-label-for="frm_submit_font_size-value"
+							<?php echo FrmSliderStyleComponent::is_value_measured( $style->post_content['submit_font_size'] ) ? 'for="frm_submit_font_size-value"' : ''; ?>
 							class="frm-style-item-heading"><?php esc_html_e( 'Font Size', 'formidable' ); ?></label>
 					</div>
 					<div class="frm7 frm_form_field">
@@ -147,7 +148,8 @@ class="frm-style-item-heading"><?php esc_html_e( 'Border Color', 'formidable' );
 
 					<div class="frm5 frm_form_field">
 						<label
-							for="frm_submit_border_width-value"
+							data-slider-label-for="frm_submit_border_width-value"
+							<?php echo FrmSliderStyleComponent::is_value_measured( $style->post_content['submit_border_width'] ) ? 'for="frm_submit_border_width-value"' : ''; ?>
 							class="frm-style-item-heading"><?php esc_html_e( 'Border Width', 'formidable' ); ?></label>
 					</div>
 					<div class="frm7 frm_form_field">
@@ -183,7 +185,8 @@ class="frm-style-item-heading"><?php esc_html_e( 'Shadow', 'formidable' ); ?></l
 
 					<div class="frm5 frm_form_field">
 						<label
-							for="frm_submit_border_radius-value"
+							data-slider-label-for="frm_submit_border_radius-value"
+							<?php echo FrmSliderStyleComponent::is_value_measured( $style->post_content['submit_border_radius'] ) ? 'for="frm_submit_border_radius-value"' : ''; ?>
 							class="frm-style-item-heading"><?php esc_html_e( 'Corner Radius', 'formidable' ); ?></label>
 					</div>
 					<div class="frm7 frm_form_field">
diff --git a/classes/views/styles/_check-box-radio-fields.php b/classes/views/styles/_check-box-radio-fields.php
index 94e602c663..c36c7b7d40 100644
--- a/classes/views/styles/_check-box-radio-fields.php
+++ b/classes/views/styles/_check-box-radio-fields.php
@@ -23,7 +23,8 @@ class="frm-style-item-heading"><?php esc_html_e( 'Color', 'formidable' ); ?></la
 
 <div class="frm5 frm_form_field">
 	<label 
-		for="frm_check_font_size-value"
+		data-slider-label-for="frm_check_font_size-value"
+		<?php echo FrmSliderStyleComponent::is_value_measured( $style->post_content['check_font_size'] ) ? 'for="frm_check_font_size-value"' : ''; ?>
 		class="frm-style-item-heading"><?php esc_html_e( 'Font Size', 'formidable' ); ?></label>
 </div>
 <div class="frm7 frm_form_field">
diff --git a/classes/views/styles/_field-colors.php b/classes/views/styles/_field-colors.php
index 2cb662bba4..d2615af1b4 100644
--- a/classes/views/styles/_field-colors.php
+++ b/classes/views/styles/_field-colors.php
@@ -75,7 +75,8 @@ class="frm-style-item-heading"><?php esc_html_e( 'Border', 'formidable' ); ?></l
 
 					<div class="frm5 frm_form_field">
 						<label
-							for="frm_field_border_width-value"
+							data-slider-label-for="frm_field_border_width-value"
+							<?php echo FrmSliderStyleComponent::is_value_measured( $style->post_content['field_border_width'] ) ? 'for="frm_field_border_width-value"' : ''; ?>
 							class="frm-style-item-heading"><?php esc_html_e( 'Border Width', 'formidable' ); ?></label>
 					</div>
 					<div class="frm7 frm_form_field">
@@ -309,7 +310,8 @@ class="frm-style-item-heading"><?php esc_html_e( 'Border', 'formidable' ); ?></l
 
 					<div class="frm5 frm_form_field">
 						<label
-							for="frm_border_width_error-value"
+							data-slider-label-for="frm_border_width_error-value"
+							<?php echo FrmSliderStyleComponent::is_value_measured( $style->post_content['border_width_error'] ) ? 'for="frm_border_width_error-value"' : ''; ?>
 							class="frm-style-item-heading"><?php esc_html_e( 'Border Width', 'formidable' ); ?></label>
 					</div>
 					<div class="frm7 frm_form_field">
diff --git a/classes/views/styles/_field-description.php b/classes/views/styles/_field-description.php
index a2b0134d15..abb54e5aef 100644
--- a/classes/views/styles/_field-description.php
+++ b/classes/views/styles/_field-description.php
@@ -23,7 +23,8 @@ class="frm-style-item-heading"><?php esc_html_e( 'Color', 'formidable' ); ?></la
 
 <div class="frm5 frm_form_field">
 	<label 
-		for="frm_description_font_size-value"
+		data-slider-label-for="frm_description_font_size-value"
+		<?php echo FrmSliderStyleComponent::is_value_measured( $style->post_content['description_font_size'] ) ? 'for="frm_description_font_size-value"' : ''; ?>
 		class="frm-style-item-heading"><?php esc_html_e( 'Font Size', 'formidable' ); ?></label>
 </div>
 <div class="frm7 frm_form_field">
diff --git a/classes/views/styles/_field-labels.php b/classes/views/styles/_field-labels.php
index fa476ee687..eaea6375a1 100644
--- a/classes/views/styles/_field-labels.php
+++ b/classes/views/styles/_field-labels.php
@@ -37,7 +37,8 @@ class="frm-style-item-heading"><?php esc_html_e( 'Color', 'formidable' ); ?></la
 
 					<div class="frm5 frm_form_field">
 						<label
-							for="frm_font_size-value"
+							data-slider-label-for="frm_font_size-value"
+							<?php echo FrmSliderStyleComponent::is_value_measured( $style->post_content['font_size'] ) ? 'for="frm_font_size-value"' : ''; ?>
 							class="frm-style-item-heading"><?php esc_html_e( 'Font Size', 'formidable' ); ?></label>
 					</div>
 					<div class="frm7 frm_form_field">
@@ -109,7 +110,8 @@ class="frm-style-item-heading"><?php esc_html_e( 'Align', 'formidable' ); ?></la
 
 					<div class="frm5 frm_form_field">
 						<label
-							for="frm_width-value"
+							data-slider-label-for="frm_width-value"
+							<?php echo FrmSliderStyleComponent::is_value_measured( $style->post_content['width'] ) ? 'for="frm_width-value"' : ''; ?>
 							class="frm-style-item-heading"><?php esc_html_e( 'Width', 'formidable' ); ?></label>
 					</div>
 					<div class="frm7 frm_form_field frm-md-z-index">
diff --git a/classes/views/styles/_field-sizes.php b/classes/views/styles/_field-sizes.php
index 5da73a0cf1..bda970e10a 100644
--- a/classes/views/styles/_field-sizes.php
+++ b/classes/views/styles/_field-sizes.php
@@ -5,7 +5,8 @@
 ?>
 <div class="frm5 frm_form_field">
 	<label 
-		for="frm_field_font_size-value"
+		data-slider-label-for="frm_field_font_size-value"
+		<?php echo FrmSliderStyleComponent::is_value_measured( $style->post_content['field_font_size'] ) ? 'for="frm_field_font_size-value"' : ''; ?>
 		class="frm-style-item-heading"><?php esc_html_e( 'Font Size', 'formidable' ); ?></label>
 </div>
 <div class="frm7 frm_form_field">
@@ -41,7 +42,8 @@ class="frm-style-item-heading"><?php esc_html_e( 'Weight', 'formidable' ); ?></l
 
 <div class="frm5 frm_form_field">
 	<label 
-		for="frm_field_height-value"
+		data-slider-label-for="frm_field_height-value"
+		<?php echo FrmSliderStyleComponent::is_value_measured( $style->post_content['field_height'] ) ? 'for="frm_field_height-value"' : ''; ?>
 		class="frm-style-item-heading"><?php esc_html_e( 'Height', 'formidable' ); ?></label>
 </div>
 <div class="frm7 frm_form_field">
@@ -58,7 +60,8 @@ class="frm-style-item-heading"><?php esc_html_e( 'Height', 'formidable' ); ?></l
 </div>
 <div class="frm5 frm_form_field">
 	<label 
-		for="frm_field_width-value"
+		data-slider-label-for="frm_field_width-value"
+		<?php echo FrmSliderStyleComponent::is_value_measured( $style->post_content['field_width'] ) ? 'for="frm_field_width-value"' : ''; ?>
 		class="frm-style-item-heading"><?php esc_html_e( 'Width', 'formidable' ); ?></label>
 </div>
 <div class="frm7 frm_form_field">
@@ -111,7 +114,8 @@ class="frm-style-item-heading"><?php esc_html_e( 'Margin', 'formidable' ); ?></l
 </div>
 <div class="frm5 frm_form_field">
 	<label 
-		for="frm_border_radius-value"
+		data-slider-label-for="frm_border_radius-value"
+		<?php echo FrmSliderStyleComponent::is_value_measured( $style->post_content['border_radius'] ) ? 'for="frm_border_radius-value"' : ''; ?>
 		class="frm-style-item-heading"><?php esc_html_e( 'Corner Radius', 'formidable' ); ?></label>
 </div>
 <div class="frm7 frm_form_field">
diff --git a/classes/views/styles/_form-description.php b/classes/views/styles/_form-description.php
index 6e834f0d38..1589827a56 100644
--- a/classes/views/styles/_form-description.php
+++ b/classes/views/styles/_form-description.php
@@ -6,7 +6,8 @@
 
 <div class="frm5 frm_form_field">
 	<label 
-		for="frm_form_desc_size-value"
+		data-slider-label-for="frm_form_desc_size-value"
+		<?php echo FrmSliderStyleComponent::is_value_measured( $style->post_content['form_desc_size'] ) ? 'for="frm_form_desc_size-value"' : ''; ?>
 		class="frm-style-item-heading"><?php esc_html_e( 'Font Size', 'formidable' ); ?>
 	</label>
 </div>
diff --git a/classes/views/styles/_form-messages.php b/classes/views/styles/_form-messages.php
index 23211b0752..749d2c5e1a 100644
--- a/classes/views/styles/_form-messages.php
+++ b/classes/views/styles/_form-messages.php
@@ -73,7 +73,8 @@ class="frm-style-item-heading"><?php esc_html_e( 'Font Color', 'formidable' ); ?
 
 					<div class="frm5 frm_form_field">
 						<label
-							for="frm_success_font_size-value"
+							data-slider-label-for="frm_success_font_size-value"
+							<?php echo FrmSliderStyleComponent::is_value_measured( $style->post_content['success_font_size'] ) ? 'for="frm_success_font_size-value"' : ''; ?>
 							class="frm-style-item-heading"><?php esc_html_e( 'Font Size', 'formidable' ); ?></label>
 					</div>
 					<div class="frm7 frm_form_field">
@@ -149,7 +150,8 @@ class="frm-style-item-heading"><?php esc_html_e( 'Font Color', 'formidable' ); ?
 
 					<div class="frm5 frm_form_field">
 						<label
-							for="frm_error_font_size-value"
+							data-slider-label-for="frm_error_font_size-value"
+							<?php echo FrmSliderStyleComponent::is_value_measured( $style->post_content['error_font_size'] ) ? 'for="frm_error_font_size-value"' : ''; ?>
 							class="frm-style-item-heading"><?php esc_html_e( 'Font Size', 'formidable' ); ?></label>
 					</div>
 					<div class="frm7 frm_form_field">
diff --git a/classes/views/styles/_form-title.php b/classes/views/styles/_form-title.php
index 0b1f34cc5c..fe9cb8253b 100644
--- a/classes/views/styles/_form-title.php
+++ b/classes/views/styles/_form-title.php
@@ -23,7 +23,8 @@ class="frm-style-item-heading"><?php esc_html_e( 'Color', 'formidable' ); ?></la
 
 <div class="frm5 frm_form_field">
 	<label 
-		for="frm_title_size-value"
+		data-slider-label-for="frm_title_size-value"
+		<?php echo FrmSliderStyleComponent::is_value_measured( $style->post_content['title_size'] ) ? 'for="frm_title_size-value"' : ''; ?>
 		class="frm-style-item-heading"><?php esc_html_e( 'Font Size', 'formidable' ); ?></label>
 </div>
 <div class="frm7 frm_form_field">
diff --git a/classes/views/styles/_general.php b/classes/views/styles/_general.php
index 5508b9d080..37c61b94d7 100644
--- a/classes/views/styles/_general.php
+++ b/classes/views/styles/_general.php
@@ -65,7 +65,8 @@ class="frm-style-item-heading"><?php esc_html_e( 'Border Color', 'formidable' );
 
 <div class="frm5 frm_form_field">
 	<label 
-		for="frm_fieldset-value"
+		data-slider-label-for="frm_fieldset-value"
+		<?php echo FrmSliderStyleComponent::is_value_measured( $style->post_content['fieldset'] ) ? 'for="frm_fieldset-value"' : ''; ?>
 		class="frm-style-item-heading"><?php esc_html_e( 'Border Width', 'formidable' ); ?></label>
 </div>
 <div class="frm7 frm_form_field">
@@ -102,7 +103,8 @@ class="frm-style-item-heading"><?php esc_html_e( 'Padding', 'formidable' ); ?></
 
 <div class="frm5 frm_form_field">
 	<label 
-		for="frm_form_width-value"
+		data-slider-label-for="frm_form_width-value"
+		<?php echo FrmSliderStyleComponent::is_value_measured( $style->post_content['form_width'] ) ? 'for="frm_form_width-value"' : ''; ?>
 		class="frm-style-item-heading"><?php esc_html_e( 'Form Width', 'formidable' ); ?></label>
 </div>
 <div class="frm7 frm_form_field">
diff --git a/classes/views/styles/_quick-settings.php b/classes/views/styles/_quick-settings.php
index a86ece648e..9c3f6f71a9 100644
--- a/classes/views/styles/_quick-settings.php
+++ b/classes/views/styles/_quick-settings.php
@@ -161,7 +161,8 @@ class="frm-style-item-heading"><?php esc_html_e( 'Input Field Padding', 'formida
 <hr class="frm12"/>
 <div class="frm5 frm_form_field">
 	<label 
-		for="frm_base_font_size-value"
+		data-slider-label-for="frm_base_font_size-value"
+		<?php echo FrmSliderStyleComponent::is_value_measured( $style->post_content['base_font_size'] ) ? 'for="frm_base_font_size-value"' : ''; ?>
 		class="frm-style-item-heading"><?php esc_html_e( 'Base Font Size', 'formidable' ); ?></label>
 </div>
 <div class="frm7 frm_form_field">
@@ -207,7 +208,8 @@ class="frm-style-item-heading"><?php esc_html_e( 'Field Shape', 'formidable' );
 
 <div class="frm5 frm_form_field frm_hidden" data-frm-element="field-shape-corner-radius">
 	<label
-		for="frm_style_qsettings_border_radius-value"
+		data-slider-label-for="frm_style_qsettings_border_radius-value"
+		<?php echo FrmSliderStyleComponent::is_value_measured( $style->post_content['border_radius'] ) ? 'for="frm_style_qsettings_border_radius-value"' : ''; ?>
 		class="frm-style-item-heading"><?php esc_html_e( 'Corner Radius', 'formidable' ); ?></label>
 </div>
 <div class="frm7 frm_form_field frm_hidden frm-md-z-index" data-frm-element="field-shape-corner-radius">
diff --git a/tests/cypress/e2e/Styles/styleLabelFocusTargets.cy.js b/tests/cypress/e2e/Styles/styleLabelFocusTargets.cy.js
index d0e798715e..3e268ed6d9 100644
--- a/tests/cypress/e2e/Styles/styleLabelFocusTargets.cy.js
+++ b/tests/cypress/e2e/Styles/styleLabelFocusTargets.cy.js
@@ -30,6 +30,33 @@ describe( 'Style builder labels focus their visible/interactive control', () =>
 		cy.focused().should( 'have.id', 'frm_fieldset-value' );
 	} );
 
+	it( 'A slider label outside Width/Height also drops its focus target once its unit is cleared to "Not set"', () => {
+		cy.intercept( 'POST', '**/admin-ajax.php', req => {
+			if ( req.body?.includes( 'action=frm_change_styling' ) ) {
+				req.alias = 'changeStyling';
+			}
+		} );
+
+		cy.visit( '/wp-admin/admin.php?page=formidable-styles&section=advanced-settings' );
+		cy.get( '#general-style' ).should( 'have.class', 'open' );
+
+		cy.log( '"Border Width" (frm_fieldset) ships with a measured default, so the label starts wired up' );
+		cy.get( '[data-slider-label-for="frm_fieldset-value"]' ).should( 'have.attr', 'for', 'frm_fieldset-value' );
+
+		cy.log( 'Clearing the unit to "Not set" disables the value input and drops the label\'s focus target' );
+		cy.get( '#frm_fieldset' ).closest( '.frm-slider-component' ).find( '.frm-slider-value select' ).select( '' );
+		cy.wait( '@changeStyling', { timeout: 10000 } );
+		cy.get( '#frm_fieldset-value' ).should( 'be.disabled' );
+		cy.get( '[data-slider-label-for="frm_fieldset-value"]' ).should( 'not.have.attr', 'for' );
+
+		cy.log( 'Choosing a measured unit again re-associates the label with the now-enabled input' );
+		cy.get( '#frm_fieldset' ).closest( '.frm-slider-component' ).find( '.frm-slider-value select' ).select( 'px' );
+		cy.wait( '@changeStyling', { timeout: 10000 } );
+		cy.get( '[data-slider-label-for="frm_fieldset-value"]' ).should( 'have.attr', 'for', 'frm_fieldset-value' );
+		cy.get( '[data-slider-label-for="frm_fieldset-value"]' ).click();
+		cy.focused().should( 'have.id', 'frm_fieldset-value' );
+	} );
+
 	it( 'A "Width"/"Height" label targets nothing while its unit defaults to "auto", and gets a working focus target once a measured unit is chosen', () => {
 		cy.intercept( 'POST', '**/admin-ajax.php', req => {
 			if ( req.body?.includes( 'action=frm_change_styling' ) ) {