diff --git a/src/ui/components/FaDrawer/index.vue b/src/ui/components/FaDrawer/index.vue
index 5a0a9100..e363c628 100644
--- a/src/ui/components/FaDrawer/index.vue
+++ b/src/ui/components/FaDrawer/index.vue
@@ -179,10 +179,10 @@ function handleAnimationEnd() {
         })"
       >
         <slot name="footer">
-          <FaButton variant="outline" @click="onCancel">
+          <FaButton v-if="showCancelButton" variant="outline" @click="onCancel">
             {{ cancelButtonText }}
           </FaButton>
-          <FaButton @click="onConfirm">
+          <FaButton v-if="showConfirmButton" :disabled="confirmButtonDisabled" :loading="confirmButtonLoading" @click="onConfirm">
             {{ confirmButtonText }}
           </FaButton>
         </slot>
diff --git a/src/ui/components/FaModal/index.vue b/src/ui/components/FaModal/index.vue
index 9a80dcd9..89d9bcb4 100644
--- a/src/ui/components/FaModal/index.vue
+++ b/src/ui/components/FaModal/index.vue
@@ -224,7 +224,7 @@ function handleAnimationEnd() {
           <FaButton v-if="showCancelButton" variant="outline" @click="onCancel">
             {{ cancelButtonText }}
           </FaButton>
-          <FaButton v-if="showConfirmButton" @click="onConfirm">
+          <FaButton v-if="showConfirmButton" :disabled="confirmButtonDisabled" :loading="confirmButtonLoading" @click="onConfirm">
             {{ confirmButtonText }}
           </FaButton>
         </slot>