diff --git a/packages/react-sdk-components/src/components/infra/Containers/ModalViewContainer/ListViewActionButtons/ListViewActionButtons.tsx b/packages/react-sdk-components/src/components/infra/Containers/ModalViewContainer/ListViewActionButtons/ListViewActionButtons.tsx
index 9d6edede..d157d5e0 100644
--- a/packages/react-sdk-components/src/components/infra/Containers/ModalViewContainer/ListViewActionButtons/ListViewActionButtons.tsx
+++ b/packages/react-sdk-components/src/components/infra/Containers/ModalViewContainer/ListViewActionButtons/ListViewActionButtons.tsx
@@ -50,12 +50,14 @@ function ListViewActionButtons(props: ListViewActionButtonsProps) {
             .getActionsApi()
             .submitEmbeddedDataModal(context)
             .then(() => {
-              setIsDisabled(false);
               closeActionsDialog();
             })
             .catch(err => {
               // eslint-disable-next-line no-console
               console.log(err);
+            })
+            .finally(() => {
+              setIsDisabled(false);
             });
         }}
       >