diff --git a/client/src/containers/Accounting/MakeJournalEntriesFooter.js b/client/src/containers/Accounting/MakeJournalEntriesFooter.js
index be7e06005..63057c804 100644
--- a/client/src/containers/Accounting/MakeJournalEntriesFooter.js
+++ b/client/src/containers/Accounting/MakeJournalEntriesFooter.js
@@ -114,6 +114,7 @@ export default function MakeJournalEntriesFooter({
             position={Position.BOTTOM_LEFT}
           >
             <Button
+              disabled={isSubmitting}
               intent={Intent.PRIMARY}
               rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
             />
@@ -146,6 +147,7 @@ export default function MakeJournalEntriesFooter({
             position={Position.BOTTOM_LEFT}
           >
             <Button
+              disabled={isSubmitting}
               rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
             />
           </Popover>
@@ -175,6 +177,7 @@ export default function MakeJournalEntriesFooter({
             position={Position.BOTTOM_LEFT}
           >
             <Button
+              disabled={isSubmitting}
               intent={Intent.PRIMARY}
               rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
             />
diff --git a/client/src/containers/Customers/CustomerFloatingActions.js b/client/src/containers/Customers/CustomerFloatingActions.js
index 9110306b5..3e19b6181 100644
--- a/client/src/containers/Customers/CustomerFloatingActions.js
+++ b/client/src/containers/Customers/CustomerFloatingActions.js
@@ -74,6 +74,7 @@ export default function CustomerFloatingActions({
           position={Position.BOTTOM_LEFT}
         >
           <Button
+            disabled={isSubmitting}
             intent={Intent.PRIMARY}
             rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
           />
diff --git a/client/src/containers/Expenses/ExpenseFloatingActions.js b/client/src/containers/Expenses/ExpenseFloatingActions.js
index e04999ad1..485f24f91 100644
--- a/client/src/containers/Expenses/ExpenseFloatingActions.js
+++ b/client/src/containers/Expenses/ExpenseFloatingActions.js
@@ -114,6 +114,7 @@ export default function ExpenseFloatingFooter({
             position={Position.BOTTOM_LEFT}
           >
             <Button
+              disabled={isSubmitting}
               intent={Intent.PRIMARY}
               rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
             />
@@ -146,6 +147,7 @@ export default function ExpenseFloatingFooter({
             position={Position.BOTTOM_LEFT}
           >
             <Button
+              disabled={isSubmitting}
               rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
             />
           </Popover>
@@ -175,6 +177,7 @@ export default function ExpenseFloatingFooter({
             position={Position.BOTTOM_LEFT}
           >
             <Button
+              disabled={isSubmitting}
               intent={Intent.PRIMARY}
               rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
             />
diff --git a/client/src/containers/Purchases/Bill/BillFloatingActions.js b/client/src/containers/Purchases/Bill/BillFloatingActions.js
index dbbecbc2e..450c593df 100644
--- a/client/src/containers/Purchases/Bill/BillFloatingActions.js
+++ b/client/src/containers/Purchases/Bill/BillFloatingActions.js
@@ -115,6 +115,7 @@ export default function BillFloatingActions({
             position={Position.BOTTOM_LEFT}
           >
             <Button
+              disabled={isSubmitting}
               intent={Intent.PRIMARY}
               rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
             />
@@ -147,6 +148,7 @@ export default function BillFloatingActions({
             position={Position.BOTTOM_LEFT}
           >
             <Button
+              disabled={isSubmitting}
               rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
             />
           </Popover>
@@ -176,6 +178,7 @@ export default function BillFloatingActions({
             position={Position.BOTTOM_LEFT}
           >
             <Button
+              disabled={isSubmitting}
               intent={Intent.PRIMARY}
               rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
             />
diff --git a/client/src/containers/Purchases/PaymentMades/PaymentMadeFloatingActions.js b/client/src/containers/Purchases/PaymentMades/PaymentMadeFloatingActions.js
index 7b4363e14..1fe38e7d2 100644
--- a/client/src/containers/Purchases/PaymentMades/PaymentMadeFloatingActions.js
+++ b/client/src/containers/Purchases/PaymentMades/PaymentMadeFloatingActions.js
@@ -84,6 +84,7 @@ export default function PaymentMadeFloatingActions({
           position={Position.BOTTOM_LEFT}
         >
           <Button
+            disabled={isSubmitting}
             intent={Intent.PRIMARY}
             rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
           />
diff --git a/client/src/containers/Sales/Estimate/EstimateFloatingActions.js b/client/src/containers/Sales/Estimate/EstimateFloatingActions.js
index d6df854ff..bb9b4b93a 100644
--- a/client/src/containers/Sales/Estimate/EstimateFloatingActions.js
+++ b/client/src/containers/Sales/Estimate/EstimateFloatingActions.js
@@ -32,7 +32,7 @@ export default function EstimateFloatingActions({
   const handleSubmitPublishBtnClick = (event) => {
     saveInvoke(onSubmitClick, event, {
       redirect: true,
-      publish: true
+      publish: true,
     });
   };
 
@@ -116,6 +116,7 @@ export default function EstimateFloatingActions({
             position={Position.BOTTOM_LEFT}
           >
             <Button
+              disabled={isSubmitting}
               intent={Intent.PRIMARY}
               rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
             />
@@ -148,6 +149,7 @@ export default function EstimateFloatingActions({
             position={Position.BOTTOM_LEFT}
           >
             <Button
+              disabled={isSubmitting}
               rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
             />
           </Popover>
@@ -177,6 +179,7 @@ export default function EstimateFloatingActions({
             position={Position.BOTTOM_LEFT}
           >
             <Button
+              disabled={isSubmitting}
               intent={Intent.PRIMARY}
               rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
             />
diff --git a/client/src/containers/Sales/Invoice/InvoiceFloatingActions.js b/client/src/containers/Sales/Invoice/InvoiceFloatingActions.js
index 7a50896e9..32954c18d 100644
--- a/client/src/containers/Sales/Invoice/InvoiceFloatingActions.js
+++ b/client/src/containers/Sales/Invoice/InvoiceFloatingActions.js
@@ -32,7 +32,7 @@ export default function InvoiceFloatingActions({
   const handleSubmitPublishBtnClick = (event) => {
     saveInvoke(onSubmitClick, event, {
       redirect: true,
-      publish: true
+      publish: true,
     });
   };
 
@@ -116,6 +116,7 @@ export default function InvoiceFloatingActions({
             position={Position.BOTTOM_LEFT}
           >
             <Button
+              disabled={isSubmitting}
               intent={Intent.PRIMARY}
               rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
             />
@@ -148,6 +149,7 @@ export default function InvoiceFloatingActions({
             position={Position.BOTTOM_LEFT}
           >
             <Button
+              disabled={isSubmitting}
               rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
             />
           </Popover>
@@ -177,6 +179,7 @@ export default function InvoiceFloatingActions({
             position={Position.BOTTOM_LEFT}
           >
             <Button
+              disabled={isSubmitting}
               intent={Intent.PRIMARY}
               rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
             />
diff --git a/client/src/containers/Sales/PaymentReceive/PaymentReceiveFloatingActions.js b/client/src/containers/Sales/PaymentReceive/PaymentReceiveFloatingActions.js
index 318ea4a9e..17735b603 100644
--- a/client/src/containers/Sales/PaymentReceive/PaymentReceiveFloatingActions.js
+++ b/client/src/containers/Sales/PaymentReceive/PaymentReceiveFloatingActions.js
@@ -87,6 +87,7 @@ export default function PaymentReceiveFormFloatingActions({
           position={Position.BOTTOM_LEFT}
         >
           <Button
+            disabled={isSubmitting}
             intent={Intent.PRIMARY}
             rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
           />
diff --git a/client/src/containers/Sales/Receipt/ReceiptFormFloatingActions.js b/client/src/containers/Sales/Receipt/ReceiptFormFloatingActions.js
index 5333bec16..0d53fd0f4 100644
--- a/client/src/containers/Sales/Receipt/ReceiptFormFloatingActions.js
+++ b/client/src/containers/Sales/Receipt/ReceiptFormFloatingActions.js
@@ -116,6 +116,7 @@ export default function ReceiptFormFloatingActions({
             position={Position.BOTTOM_LEFT}
           >
             <Button
+              disabled={isSubmitting}
               intent={Intent.PRIMARY}
               rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
             />
@@ -148,6 +149,7 @@ export default function ReceiptFormFloatingActions({
             position={Position.BOTTOM_LEFT}
           >
             <Button
+              disabled={isSubmitting}
               rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
             />
           </Popover>
@@ -177,6 +179,7 @@ export default function ReceiptFormFloatingActions({
             position={Position.BOTTOM_LEFT}
           >
             <Button
+              disabled={isSubmitting}
               intent={Intent.PRIMARY}
               rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
             />
diff --git a/client/src/containers/Vendors/VendorFloatingActions.js b/client/src/containers/Vendors/VendorFloatingActions.js
index 3ad4ec27c..04b01fdf7 100644
--- a/client/src/containers/Vendors/VendorFloatingActions.js
+++ b/client/src/containers/Vendors/VendorFloatingActions.js
@@ -75,6 +75,7 @@ export default function VendorFloatingActions({
           position={Position.BOTTOM_LEFT}
         >
           <Button
+            disabled={isSubmitting}
             intent={Intent.PRIMARY}
             rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
           />