diff --git a/client/components/open/forms/OpenFormField.vue b/client/components/open/forms/OpenFormField.vue
index 66dcf4a6..d98bef74 100644
--- a/client/components/open/forms/OpenFormField.vue
+++ b/client/components/open/forms/OpenFormField.vue
@@ -248,7 +248,7 @@ export default {
       this.workingFormStore.openAddFieldSidebar(this.field)
     },
     getFieldWidthClasses(field) {
-      if (!field.width || field.width === 'full') return 'col-span-full w-full'
+      if (!field.width || field.width === 'full') return 'col-span-full'
       else if (field.width === '1/2') {
         return 'w-full sm:col-span-6 col-span-full'
       } else if (field.width === '1/3') {
diff --git a/client/stores/working_form.js b/client/stores/working_form.js
index 0ff671dd..5ac49954 100644
--- a/client/stores/working_form.js
+++ b/client/stores/working_form.js
@@ -129,8 +129,8 @@ export const useWorkingFormStore = defineStore("working_form", {
       }
       newBlock.help_position = "below_input"
       if (
-        this.selectedFieldIndex === null ||
-        this.selectedFieldIndex === undefined
+        (this.selectedFieldIndex === null || this.selectedFieldIndex === undefined) &&
+        (index === null || index === undefined)
       ) {
         const newFields = clonedeep(this.content.properties)
         newFields.push(newBlock)