diff --git a/ui/src/components/certificate/CertificateDetailDrawer.tsx b/ui/src/components/certificate/CertificateDetailDrawer.tsx
index 2cedeb2b..361beb96 100644
--- a/ui/src/components/certificate/CertificateDetailDrawer.tsx
+++ b/ui/src/components/certificate/CertificateDetailDrawer.tsx
@@ -29,7 +29,6 @@ const CertificateDetailDrawer = ({ data, loading, trigger, ...props }: Certifica
 
       <Drawer
         afterOpenChange={setOpen}
-        closable
         destroyOnClose
         open={open}
         loading={loading}
diff --git a/ui/src/components/provider/CAProviderSelect.tsx b/ui/src/components/provider/ApplyCAProviderSelect.tsx
similarity index 93%
rename from ui/src/components/provider/CAProviderSelect.tsx
rename to ui/src/components/provider/ApplyCAProviderSelect.tsx
index 5d9637ac..fdedac9b 100644
--- a/ui/src/components/provider/CAProviderSelect.tsx
+++ b/ui/src/components/provider/ApplyCAProviderSelect.tsx
@@ -4,14 +4,14 @@ import { Avatar, Select, type SelectProps, Space, Typography } from "antd";
 
 import { type ApplyCAProvider, applyCAProvidersMap } from "@/domain/provider";
 
-export type CAProviderSelectProps = Omit<
+export type ApplyCAProviderSelectProps = Omit<
   SelectProps,
   "filterOption" | "filterSort" | "labelRender" | "options" | "optionFilterProp" | "optionLabelProp" | "optionRender"
 > & {
   filter?: (record: ApplyCAProvider) => boolean;
 };
 
-const CAProviderSelect = ({ filter, ...props }: CAProviderSelectProps) => {
+const ApplyCAProviderSelect = ({ filter, ...props }: ApplyCAProviderSelectProps) => {
   const { t } = useTranslation();
 
   const [options, setOptions] = useState<Array<{ key: string; value: string; label: string; data: ApplyCAProvider }>>([]);
@@ -80,4 +80,4 @@ const CAProviderSelect = ({ filter, ...props }: CAProviderSelectProps) => {
   );
 };
 
-export default memo(CAProviderSelect);
+export default memo(ApplyCAProviderSelect);
diff --git a/ui/src/components/provider/DNSProviderPicker.tsx b/ui/src/components/provider/ApplyDNSProviderPicker.tsx
similarity index 91%
rename from ui/src/components/provider/DNSProviderPicker.tsx
rename to ui/src/components/provider/ApplyDNSProviderPicker.tsx
index 8628fe22..10fa39ff 100644
--- a/ui/src/components/provider/DNSProviderPicker.tsx
+++ b/ui/src/components/provider/ApplyDNSProviderPicker.tsx
@@ -5,7 +5,7 @@ import { Avatar, Card, Col, Empty, Flex, Input, type InputRef, Row, Typography }
 import Show from "@/components/Show";
 import { applyDNSProvidersMap } from "@/domain/provider";
 
-export type DNSProviderPickerProps = {
+export type ApplyDNSProviderPickerProps = {
   className?: string;
   style?: React.CSSProperties;
   autoFocus?: boolean;
@@ -13,7 +13,7 @@ export type DNSProviderPickerProps = {
   onSelect?: (value: string) => void;
 };
 
-const DNSProviderPicker = ({ className, style, autoFocus, placeholder, onSelect }: DNSProviderPickerProps) => {
+const ApplyDNSProviderPicker = ({ className, style, autoFocus, placeholder, onSelect }: ApplyDNSProviderPickerProps) => {
   const { t } = useTranslation();
 
   const [keyword, setKeyword] = useState<string>();
@@ -71,4 +71,4 @@ const DNSProviderPicker = ({ className, style, autoFocus, placeholder, onSelect
   );
 };
 
-export default memo(DNSProviderPicker);
+export default memo(ApplyDNSProviderPicker);
diff --git a/ui/src/components/provider/DNSProviderSelect.tsx b/ui/src/components/provider/ApplyDNSProviderSelect.tsx
similarity index 91%
rename from ui/src/components/provider/DNSProviderSelect.tsx
rename to ui/src/components/provider/ApplyDNSProviderSelect.tsx
index 5b2f8dd0..f7e3c259 100644
--- a/ui/src/components/provider/DNSProviderSelect.tsx
+++ b/ui/src/components/provider/ApplyDNSProviderSelect.tsx
@@ -4,14 +4,14 @@ import { Avatar, Select, type SelectProps, Space, Typography } from "antd";
 
 import { type ApplyDNSProvider, applyDNSProvidersMap } from "@/domain/provider";
 
-export type DNSProviderSelectProps = Omit<
+export type ApplyDNSProviderSelectProps = Omit<
   SelectProps,
   "filterOption" | "filterSort" | "labelRender" | "options" | "optionFilterProp" | "optionLabelProp" | "optionRender"
 > & {
   filter?: (record: ApplyDNSProvider) => boolean;
 };
 
-const DNSProviderSelect = ({ filter, ...props }: DNSProviderSelectProps) => {
+const ApplyDNSProviderSelect = ({ filter, ...props }: ApplyDNSProviderSelectProps) => {
   const { t } = useTranslation();
 
   const [options, setOptions] = useState<Array<{ key: string; value: string; label: string; data: ApplyDNSProvider }>>([]);
@@ -64,4 +64,4 @@ const DNSProviderSelect = ({ filter, ...props }: DNSProviderSelectProps) => {
   );
 };
 
-export default memo(DNSProviderSelect);
+export default memo(ApplyDNSProviderSelect);
diff --git a/ui/src/components/provider/HostingProviderPicker.tsx b/ui/src/components/provider/DeployProviderPicker.tsx
similarity index 94%
rename from ui/src/components/provider/HostingProviderPicker.tsx
rename to ui/src/components/provider/DeployProviderPicker.tsx
index c573faf4..cc34ef16 100644
--- a/ui/src/components/provider/HostingProviderPicker.tsx
+++ b/ui/src/components/provider/DeployProviderPicker.tsx
@@ -5,7 +5,7 @@ import { Avatar, Card, Col, Empty, Flex, Input, type InputRef, Row, Tabs, Toolti
 import Show from "@/components/Show";
 import { DEPLOY_CATEGORIES, deployProvidersMap } from "@/domain/provider";
 
-export type HostingProviderPickerProps = {
+export type DeployProviderPickerProps = {
   className?: string;
   style?: React.CSSProperties;
   autoFocus?: boolean;
@@ -13,7 +13,7 @@ export type HostingProviderPickerProps = {
   onSelect?: (value: string) => void;
 };
 
-const HostingProviderPicker = ({ className, style, autoFocus, placeholder, onSelect }: HostingProviderPickerProps) => {
+const DeployProviderPicker = ({ className, style, autoFocus, placeholder, onSelect }: DeployProviderPickerProps) => {
   const { t } = useTranslation();
 
   const [keyword, setKeyword] = useState<string>();
@@ -110,4 +110,4 @@ const HostingProviderPicker = ({ className, style, autoFocus, placeholder, onSel
   );
 };
 
-export default memo(HostingProviderPicker);
+export default memo(DeployProviderPicker);
diff --git a/ui/src/components/provider/HostingProviderSelect.tsx b/ui/src/components/provider/DeployProviderSelect.tsx
similarity index 91%
rename from ui/src/components/provider/HostingProviderSelect.tsx
rename to ui/src/components/provider/DeployProviderSelect.tsx
index 4cc4cb9a..5be10cb7 100644
--- a/ui/src/components/provider/HostingProviderSelect.tsx
+++ b/ui/src/components/provider/DeployProviderSelect.tsx
@@ -4,14 +4,14 @@ import { Avatar, Select, type SelectProps, Space, Typography } from "antd";
 
 import { type DeployProvider, deployProvidersMap } from "@/domain/provider";
 
-export type HostingProviderSelectProps = Omit<
+export type DeployProviderSelectProps = Omit<
   SelectProps,
   "filterOption" | "filterSort" | "labelRender" | "options" | "optionFilterProp" | "optionLabelProp" | "optionRender"
 > & {
   filter?: (record: DeployProvider) => boolean;
 };
 
-const HostingProviderSelect = ({ filter, ...props }: HostingProviderSelectProps) => {
+const DeployProviderSelect = ({ filter, ...props }: DeployProviderSelectProps) => {
   const { t } = useTranslation();
 
   const [options, setOptions] = useState<Array<{ key: string; value: string; label: string; data: DeployProvider }>>([]);
@@ -64,4 +64,4 @@ const HostingProviderSelect = ({ filter, ...props }: HostingProviderSelectProps)
   );
 };
 
-export default memo(HostingProviderSelect);
+export default memo(DeployProviderSelect);
diff --git a/ui/src/components/workflow/WorkflowRunDetailDrawer.tsx b/ui/src/components/workflow/WorkflowRunDetailDrawer.tsx
index 79eb103c..dc8149f3 100644
--- a/ui/src/components/workflow/WorkflowRunDetailDrawer.tsx
+++ b/ui/src/components/workflow/WorkflowRunDetailDrawer.tsx
@@ -30,7 +30,6 @@ const WorkflowRunDetailDrawer = ({ data, loading, trigger, ...props }: WorkflowR
 
       <Drawer
         afterOpenChange={setOpen}
-        closable
         destroyOnClose
         open={open}
         loading={loading}
diff --git a/ui/src/components/workflow/node/ApplyNodeConfigForm.tsx b/ui/src/components/workflow/node/ApplyNodeConfigForm.tsx
index 40ad5e68..8034c86d 100644
--- a/ui/src/components/workflow/node/ApplyNodeConfigForm.tsx
+++ b/ui/src/components/workflow/node/ApplyNodeConfigForm.tsx
@@ -31,8 +31,8 @@ import AccessEditModal from "@/components/access/AccessEditModal";
 import AccessSelect from "@/components/access/AccessSelect";
 import ModalForm from "@/components/ModalForm";
 import MultipleInput from "@/components/MultipleInput";
-import CAProviderSelect from "@/components/provider/CAProviderSelect";
-import DNSProviderSelect from "@/components/provider/DNSProviderSelect";
+import ApplyCAProviderSelect from "@/components/provider/ApplyCAProviderSelect";
+import ApplyDNSProviderSelect from "@/components/provider/ApplyDNSProviderSelect";
 import { ACCESS_USAGES, APPLY_DNS_PROVIDERS, accessProvidersMap, applyCAProvidersMap, applyDNSProvidersMap } from "@/domain/provider";
 import { type WorkflowNodeConfigForApply } from "@/domain/workflow";
 import { useAntdForm, useAntdFormName, useZustandShallowSelector } from "@/hooks";
@@ -324,7 +324,7 @@ const ApplyNodeConfigForm = forwardRef<ApplyNodeConfigFormInstance, ApplyNodeCon
           </Form.Item>
 
           <Form.Item name="provider" label={t("workflow_node.apply.form.provider.label")} hidden={!showProvider} rules={[formRule]}>
-            <DNSProviderSelect
+            <ApplyDNSProviderSelect
               disabled={!showProvider}
               filter={(record) => {
                 if (fieldProviderAccessId) {
@@ -407,7 +407,7 @@ const ApplyNodeConfigForm = forwardRef<ApplyNodeConfigFormInstance, ApplyNodeCon
               </div>
             </label>
             <Form.Item name="caProvider" rules={[formRule]}>
-              <CAProviderSelect
+              <ApplyCAProviderSelect
                 allowClear
                 placeholder={t("workflow_node.apply.form.ca_provider.placeholder")}
                 showSearch
diff --git a/ui/src/components/workflow/node/DeployNodeConfigForm.tsx b/ui/src/components/workflow/node/DeployNodeConfigForm.tsx
index 3fa34133..33d1012c 100644
--- a/ui/src/components/workflow/node/DeployNodeConfigForm.tsx
+++ b/ui/src/components/workflow/node/DeployNodeConfigForm.tsx
@@ -7,8 +7,8 @@ import { z } from "zod";
 
 import AccessEditModal from "@/components/access/AccessEditModal";
 import AccessSelect from "@/components/access/AccessSelect";
-import HostingProviderPicker from "@/components/provider/HostingProviderPicker.tsx";
-import HostingProviderSelect from "@/components/provider/HostingProviderSelect.tsx";
+import DeployProviderPicker from "@/components/provider/DeployProviderPicker.tsx";
+import DeployProviderSelect from "@/components/provider/DeployProviderSelect.tsx";
 import Show from "@/components/Show";
 import { ACCESS_USAGES, DEPLOY_PROVIDERS, accessProvidersMap, deployProvidersMap } from "@/domain/provider";
 import { type WorkflowNode, type WorkflowNodeConfigForDeploy } from "@/domain/workflow";
@@ -372,10 +372,10 @@ const DeployNodeConfigForm = forwardRef<DeployNodeConfigFormInstance, DeployNode
         <Form className={className} style={style} {...formProps} disabled={disabled} layout="vertical" scrollToFirstError onValuesChange={handleFormChange}>
           <Show
             when={!!fieldProvider}
-            fallback={<HostingProviderPicker autoFocus placeholder={t("workflow_node.deploy.search.provider.placeholder")} onSelect={handleProviderPick} />}
+            fallback={<DeployProviderPicker autoFocus placeholder={t("workflow_node.deploy.search.provider.placeholder")} onSelect={handleProviderPick} />}
           >
             <Form.Item name="provider" label={t("workflow_node.deploy.form.provider.label")} rules={[formRule]}>
-              <HostingProviderSelect
+              <DeployProviderSelect
                 allowClear
                 disabled={!!initialValues?.provider}
                 placeholder={t("workflow_node.deploy.form.provider.placeholder")}
diff --git a/ui/src/components/workflow/node/_SharedNode.tsx b/ui/src/components/workflow/node/_SharedNode.tsx
index ae981451..831d12d6 100644
--- a/ui/src/components/workflow/node/_SharedNode.tsx
+++ b/ui/src/components/workflow/node/_SharedNode.tsx
@@ -283,7 +283,8 @@ const SharedNodeConfigDrawer = ({
       {ModelContextHolder}
 
       <Drawer
-        afterOpenChange={(open) => setOpen(open)}
+        afterOpenChange={setOpen}
+        closable={!pending}
         destroyOnClose
         extra={
           <SharedNodeMenu
@@ -306,6 +307,7 @@ const SharedNodeConfigDrawer = ({
           )
         }
         loading={loading}
+        maskClosable={!pending}
         open={open}
         title={<div className="max-w-[480px] truncate">{node.name}</div>}
         width={720}