diff --git a/apps/web/components/editor/field-type-selector.tsx b/apps/web/components/editor/field-type-selector.tsx
index 1a587f6e4..685355a84 100644
--- a/apps/web/components/editor/field-type-selector.tsx
+++ b/apps/web/components/editor/field-type-selector.tsx
@@ -26,6 +26,9 @@ export default function FieldTypeSelector(props: any) {
       onChange={(e: any) => {
         setSelectedFieldType(e);
       }}
+      onMouseDown={() => {
+        props.setAdding(true);
+      }}
     >
       <div className="space-y-4">
         {fieldTypes.map((fieldType) => (
diff --git a/apps/web/components/editor/pdf-editor.tsx b/apps/web/components/editor/pdf-editor.tsx
index f68052ea4..f2fddd3da 100644
--- a/apps/web/components/editor/pdf-editor.tsx
+++ b/apps/web/components/editor/pdf-editor.tsx
@@ -20,6 +20,7 @@ export default function PDFEditor(props: any) {
   const [selectedRecipient, setSelectedRecipient]: any = useState();
   const [selectedFieldType, setSelectedFieldType] = useState();
   const noRecipients = props?.document.Recipient.length === 0;
+  const [adding, setAdding] = useState(false);
 
   function onPositionChangedHandler(position: any, id: any) {
     if (!position) return;
@@ -58,7 +59,11 @@ export default function PDFEditor(props: any) {
           onMouseUp={(e: any, page: number) => {
             e.preventDefault();
             e.stopPropagation();
-            addField(e, page);
+            console.log(adding);
+            if (adding) {
+              addField(e, page);
+              setAdding(false);
+            }
           }}
           onMouseDown={(e: any, page: number) => {
             addField(e, page);
@@ -74,6 +79,7 @@ export default function PDFEditor(props: any) {
           />
           <hr className="m-3 border-slate-300"></hr>
           <FieldTypeSelector
+            setAdding={setAdding}
             selectedRecipient={selectedRecipient}
             onChange={setSelectedFieldType}
           />
diff --git a/packages/lib/api/createOrUpdateField.ts b/packages/lib/api/createOrUpdateField.ts
index 73c397be7..08ad993f5 100644
--- a/packages/lib/api/createOrUpdateField.ts
+++ b/packages/lib/api/createOrUpdateField.ts
@@ -19,9 +19,9 @@ export const createOrUpdateField = async (
         return res.json();
       }),
       {
-        loading: "Adding...",
-        success: "Added.",
-        error: "Could not add :/",
+        loading: field?.id !== -1 ? "Saving..." : "Adding...",
+        success: field?.id !== -1 ? "Saved." : "Added.",
+        error: field?.id !== -1 ? "Could not save :/" : "Could not add :/",
       },
       {
         id: "saving field",