diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/index.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/index.js
index de13b7a4c2..8c4a75487e 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/index.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/index.js
@@ -1352,31 +1352,60 @@ const FormModal = () => {
                     {formatMessage({ id: getTrad('form.button.delete') })}
                   </Button>
                 )}
-                <CustomButton
-                  type={isCreating ? 'submit' : 'button'}
-                  color={
-                    (isCreatingContentType ||
-                      isCreatingComponent ||
-                      isEditingCategory ||
+                {isCreating && state.attributeType === 'dynamiczone' && (
+                  <CustomButton
+                    type={isCreating ? 'submit' : 'button'}
+                    color={
+                      (isCreatingContentType ||
+                        isCreatingComponent ||
+                        isEditingCategory ||
+                        (state.modalType === 'addComponentToDynamicZone' &&
+                          state.step === '1' &&
+                          !isCreatingComponentFromAView)) &&
+                      !isCreating
+                        ? 'success'
+                        : 'primary'
+                    }
+                    onClick={e => handleSubmit(e, true)}
+                    icon={
+                      (isCreatingAttribute &&
+                        !isCreatingComponentFromAView &&
+                        state.step !== '1') ||
                       (state.modalType === 'addComponentToDynamicZone' &&
-                        state.step === '1' &&
-                        !isCreatingComponentFromAView)) &&
-                    !isCreating
-                      ? 'success'
-                      : 'primary'
-                  }
-                  onClick={e => handleSubmit(e, true)}
-                  icon={
-                    (isCreatingAttribute &&
-                      !isCreatingComponentFromAView &&
-                      state.step !== '1') ||
-                    (state.modalType === 'addComponentToDynamicZone' &&
-                      isCreatingComponentFromAView) ||
-                    (isCreatingComponentFromAView && state.step === '2')
-                  }
-                >
-                  {getButtonSubmitMessage()}
-                </CustomButton>
+                        isCreatingComponentFromAView) ||
+                      (isCreatingComponentFromAView && state.step === '2')
+                    }
+                  >
+                    {getButtonSubmitMessage()}
+                  </CustomButton>
+                )}
+                {state.attributeType !== 'dynamiczone' && (
+                  <CustomButton
+                    type={isCreating ? 'submit' : 'button'}
+                    color={
+                      (isCreatingContentType ||
+                        isCreatingComponent ||
+                        isEditingCategory ||
+                        (state.modalType === 'addComponentToDynamicZone' &&
+                          state.step === '1' &&
+                          !isCreatingComponentFromAView)) &&
+                      !isCreating
+                        ? 'success'
+                        : 'primary'
+                    }
+                    onClick={e => handleSubmit(e, true)}
+                    icon={
+                      (isCreatingAttribute &&
+                        !isCreatingComponentFromAView &&
+                        state.step !== '1') ||
+                      (state.modalType === 'addComponentToDynamicZone' &&
+                        isCreatingComponentFromAView) ||
+                      (isCreatingComponentFromAView && state.step === '2')
+                    }
+                  >
+                    {getButtonSubmitMessage()}
+                  </CustomButton>
+                )}
               </div>
             </section>
           </ModalFooter>