diff --git a/includes/admin/assets/js/um-admin-field.js b/includes/admin/assets/js/um-admin-field.js
index cb9e3856..b4702a68 100644
--- a/includes/admin/assets/js/um-admin-field.js
+++ b/includes/admin/assets/js/um-admin-field.js
@@ -4,7 +4,7 @@ jQuery(document).ready(function() {
 	jQuery(document.body).on('click', '.um-admin-btns a span.remove', function(e){
 		e.preventDefault();
 
-		if ( confirm( 'This will permanently delete this custom field from database' ) ) {
+		if ( confirm( 'This will permanently delete this custom field from a database and from all forms on your site. Are you sure?' ) ) {
 
 			jQuery(this).parents('a').remove();
 
@@ -21,7 +21,7 @@ jQuery(document).ready(function() {
 
 				},
 				success: function(data){
-					
+					jQuery('#um-admin-form-builder .' + arg1).remove();
 				},
 				error: function(data){
 
diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index cd934b5c..d847ec27 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -257,6 +257,14 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 				update_option( 'um_fields', $fields );
 			}
+
+			global $wpdb;
+			$forms = $wpdb->get_col("SELECT ID FROM {$wpdb->posts} WHERE post_type = 'um_form'");
+			foreach ( $forms as $form_id ) {
+				$form_fields = get_post_meta( $form_id, '_um_custom_fields', true );
+				unset( $form_fields[ $id ] );
+				update_post_meta( $form_id, '_um_custom_fields', $form_fields );
+			}
 		}