diff --git a/admin/form-builder/assets/js/components/field-options/template.php b/admin/form-builder/assets/js/components/field-options/template.php
index 7e7b48efd..fd87e693a 100644
--- a/admin/form-builder/assets/js/components/field-options/template.php
+++ b/admin/form-builder/assets/js/components/field-options/template.php
@@ -1,8 +1,6 @@
 <div class="wpuf-form-builder-field-options">
     <div v-if="!parseInt(editing_field_id)" class="options-fileds-section text-center">
-        <p>
-            <span class="loader"></span>
-        </p>
+        <p class="wpuf-text-gray-500 wpuf-text-lg wpuf-font-medium">{{ i18n.empty_field_options_msg }}</p>
     </div>
 
     <div v-else>
diff --git a/admin/form-builder/assets/js/form-builder.js b/admin/form-builder/assets/js/form-builder.js
index 1072418dc..ffd4c1ee5 100644
--- a/admin/form-builder/assets/js/form-builder.js
+++ b/admin/form-builder/assets/js/form-builder.js
@@ -404,6 +404,7 @@
             delete_form_field_element: function (state, index) {
                 state.current_panel = 'form-fields-v4-1';
                 state.form_fields.splice(index, 1);
+                state.editing_field_id = 0;
             },
 
             // set fields for a panel section
diff --git a/admin/form-builder/views/form-builder-v4.1.php b/admin/form-builder/views/form-builder-v4.1.php
index f32ead725..98e0bd404 100644
--- a/admin/form-builder/views/form-builder-v4.1.php
+++ b/admin/form-builder/views/form-builder-v4.1.php
@@ -176,7 +176,7 @@ class="wpuf-tab wpuf-h-10 hover:wpuf-bg-white hover:wpuf-text-gray-800 hover:wpu
                     </div>
                 </section>
             </div>
-    </div>
+        </div>
     </div>
     <div
         v-show="active_tab === 'form-settings'"
diff --git a/assets/js-templates/form-components.php b/assets/js-templates/form-components.php
index 7001a5830..ac7dce2bf 100644
--- a/assets/js-templates/form-components.php
+++ b/assets/js-templates/form-components.php
@@ -509,9 +509,7 @@ class="wpuf-pro-text-alert wpuf-ml-2 wpuf-tooltip-top"
 <script type="text/x-template" id="tmpl-wpuf-field-options">
 <div class="wpuf-form-builder-field-options">
     <div v-if="!parseInt(editing_field_id)" class="options-fileds-section text-center">
-        <p>
-            <span class="loader"></span>
-        </p>
+        <p class="wpuf-text-gray-500 wpuf-text-lg wpuf-font-medium">{{ i18n.empty_field_options_msg }}</p>
     </div>
 
     <div v-else>
diff --git a/assets/js/wpuf-form-builder.js b/assets/js/wpuf-form-builder.js
index 1072418dc..ffd4c1ee5 100644
--- a/assets/js/wpuf-form-builder.js
+++ b/assets/js/wpuf-form-builder.js
@@ -404,6 +404,7 @@
             delete_form_field_element: function (state, index) {
                 state.current_panel = 'form-fields-v4-1';
                 state.form_fields.splice(index, 1);
+                state.editing_field_id = 0;
             },
 
             // set fields for a panel section
diff --git a/includes/Admin/Forms/Admin_Form_Builder.php b/includes/Admin/Forms/Admin_Form_Builder.php
index fdb827e16..561c6e610 100644
--- a/includes/Admin/Forms/Admin_Form_Builder.php
+++ b/includes/Admin/Forms/Admin_Form_Builder.php
@@ -346,6 +346,7 @@ private function i18n() {
                 'saved_form_data'         => __( 'Saved form data', 'wp-user-frontend' ),
                 'unsaved_changes'         => __( 'You have unsaved changes.', 'wp-user-frontend' ),
                 'copy_shortcode'          => __( 'Click to copy shortcode', 'wp-user-frontend' ),
+                'empty_field_options_msg' => __( 'To view field options, please start adding fields in the builder', 'wp-user-frontend' ),
                 'pro_field_message'       => $field_messages,
             ]
         );