diff --git a/classes/controllers/FrmStylesController.php b/classes/controllers/FrmStylesController.php
index 39d6741e35..1f4ee2a1e4 100644
--- a/classes/controllers/FrmStylesController.php
+++ b/classes/controllers/FrmStylesController.php
@@ -765,12 +765,12 @@ private static function manage_styles() {
 
 		$forms = FrmForm::get_published_forms();
 		foreach ( $forms as $form ) {
-			$new_style      = isset( $_POST['style'] ) && isset( $_POST['style'][ $form->id ] ) ? sanitize_text_field( wp_unslash( $_POST['style'][ $form->id ] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Missing
-			$previous_style = isset( $_POST['prev_style'] ) && isset( $_POST['prev_style'][ $form->id ] ) ? sanitize_text_field( wp_unslash( $_POST['prev_style'][ $form->id ] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Missing
-			if ( $new_style == $previous_style ) {
+			if ( ! isset( $_POST['style'] ) || ! isset( $_POST['style'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
 				continue;
 			}
 
+			$new_style = sanitize_text_field( wp_unslash( $_POST['style'][ $form->id ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
+
 			$form->options['custom_style'] = $new_style;
 			$wpdb->update( $wpdb->prefix . 'frm_forms', array( 'options' => maybe_serialize( $form->options ) ), array( 'id' => $form->id ) );
 			unset( $form );
diff --git a/classes/views/styles/_manage-styles-row.php b/classes/views/styles/_manage-styles-row.php
index ead1949088..4e1a43f3a6 100644
--- a/classes/views/styles/_manage-styles-row.php
+++ b/classes/views/styles/_manage-styles-row.php
@@ -11,9 +11,7 @@
 		<label for="<?php echo esc_attr( $dropdown_id ); ?>"><?php echo esc_html( $form_name ); ?></label>
 	</td>
 	<td>
-		<input type="hidden" name="prev_style[<?php echo absint( $form->id ); ?>]" value="<?php echo esc_attr( $active_style_id ); ?>" />
-
-		<select id="<?php echo esc_attr( $dropdown_id ); ?>" name="style[<?php echo absint( $form->id ); ?>]">
+		<select id="<?php echo esc_attr( $dropdown_id ); ?>" data-name="style[<?php echo absint( $form->id ); ?>]">
 			<?php foreach ( $styles as $style ) { ?>
 				<option value="<?php echo esc_attr( $style->ID ); ?>" <?php selected( $style->ID, $active_style_id ); ?>>
 					<?php echo esc_html( $style->post_title . ( empty( $style->menu_order ) ? '' : ' (' . __( 'default', 'formidable' ) . ')' ) ); ?>
diff --git a/js/formidable_admin.js b/js/formidable_admin.js
index d6ae438955..019d816635 100644
--- a/js/formidable_admin.js
+++ b/js/formidable_admin.js
@@ -10926,6 +10926,21 @@ function frmAdminBuildJS() {
 
 			// Set fieldsUpdated to 0 to avoid the unsaved changes pop up.
 			frmDom.util.documentOn( 'submit', '.frm_settings_form', () => fieldsUpdated = 0 );
+
+			const manageStyleSettings = document.getElementById( 'manage_styles_settings' );
+			if ( manageStyleSettings ) {
+				manageStyleSettings.addEventListener(
+					'change',
+					event => {
+						const target = event.target;
+						if ( 'SELECT' !== target.nodeName || ! target.dataset.name || target.getAttribute( 'name' ) ) {
+							return;
+						}
+
+						target.setAttribute( 'name', target.dataset.name );
+					}
+				);
+			}
 		},
 
 		exportInit: function() {