diff --git a/app/javascript/dashboard/components/ui/Switch.vue b/app/javascript/dashboard/components/ui/Switch.vue
index 7dc4bcbfb..b0bc32881 100644
--- a/app/javascript/dashboard/components/ui/Switch.vue
+++ b/app/javascript/dashboard/components/ui/Switch.vue
@@ -17,12 +17,8 @@ export default {
     value: { type: Boolean, default: false },
   },
   methods: {
-    onClick(event) {
-      if (event.pointerId === -1) {
-        event.preventDefault();
-      } else {
-        this.$emit('input', !this.value);
-      }
+    onClick() {
+      this.$emit('input', !this.value);
     },
   },
 };
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/PreChatFields.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/PreChatFields.vue
index 9d2691036..b1df3902a 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/PreChatFields.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/PreChatFields.vue
@@ -1,6 +1,6 @@
 <template>
-  <draggable v-model="preChatFields" tag="tbody">
-    <tr v-for="(item, index) in preChatFields" :key="index">
+  <draggable v-model="preChatFieldOptions" tag="tbody" @end="onDragEnd">
+    <tr v-for="(item, index) in preChatFieldOptions" :key="index">
       <td class="pre-chat-field"><fluent-icon icon="drag" /></td>
       <td class="pre-chat-field">
         <woot-switch
@@ -51,15 +51,27 @@ export default {
       type: Array,
       default: () => [],
     },
-    handlePreChatFieldOptions: {
-      type: Function,
-      default: () => {},
+  },
+  data() {
+    return {
+      preChatFieldOptions: this.preChatFields,
+    };
+  },
+  watch: {
+    preChatFields() {
+      this.preChatFieldOptions = this.preChatFields;
     },
   },
   methods: {
     isFieldEditable(item) {
       return !!standardFieldKeys[item.name] || !item.enabled;
     },
+    handlePreChatFieldOptions(event, type, item) {
+      this.$emit('update', event, type, item);
+    },
+    onDragEnd() {
+      this.$emit('drag-end', this.preChatFieldOptions);
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/Settings.vue
index 184e16e0f..15bed8dfa 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/Settings.vue
@@ -26,8 +26,8 @@
             "
           />
         </label>
-        <label class="medium-8 columns">
-          {{ $t('INBOX_MGMT.PRE_CHAT_FORM.SET_FIELDS') }}
+        <div class="medium-8 columns">
+          <label>{{ $t('INBOX_MGMT.PRE_CHAT_FORM.SET_FIELDS') }}</label>
           <table class="table table-striped w-full">
             <thead class="thead-dark">
               <tr>
@@ -58,10 +58,11 @@
             </thead>
             <pre-chat-fields
               :pre-chat-fields="preChatFields"
-              :handle-pre-chat-field-options="handlePreChatFieldOptions"
+              @update="handlePreChatFieldOptions"
+              @drag-end="changePreChatFieldFieldsOrder"
             />
           </table>
-        </label>
+        </div>
       </div>
 
       <woot-submit-button
@@ -138,6 +139,10 @@ export default {
       });
     },
 
+    changePreChatFieldFieldsOrder(updatedPreChatFieldOptions) {
+      this.preChatFields = updatedPreChatFieldOptions;
+    },
+
     async updateInbox() {
       try {
         const payload = {