diff --git a/client/packages/lowcoder/src/comps/controls/eventHandlerControl.tsx b/client/packages/lowcoder/src/comps/controls/eventHandlerControl.tsx
index dac3dd023..631c322c8 100644
--- a/client/packages/lowcoder/src/comps/controls/eventHandlerControl.tsx
+++ b/client/packages/lowcoder/src/comps/controls/eventHandlerControl.tsx
@@ -14,6 +14,7 @@ import {
   EventContent,
   EventDiv,
   EventTitle,
+  Tooltip,
   InlineEventFormWrapper,
   LinkButton,
   OptionType,
@@ -123,7 +124,11 @@ class SingleEventHandlerControl<
           defaultVisible={props.popup}
         >
           <EventContent>
-            {!_.isEmpty(eventName) && <EventTitle>{eventName}</EventTitle>}
+            {!_.isEmpty(eventName) && (
+              <Tooltip title={eventName} placement="top">
+                <EventTitle>{eventName}</EventTitle>
+              </Tooltip>
+            )}
             <EventAction>{eventAction}</EventAction>
           </EventContent>
         </CustomPopover>
diff --git a/client/packages/lowcoder/src/comps/queries/queryComp/queryConfirmationModal.tsx b/client/packages/lowcoder/src/comps/queries/queryComp/queryConfirmationModal.tsx
index 66f5de712..0ad6c73bc 100644
--- a/client/packages/lowcoder/src/comps/queries/queryComp/queryConfirmationModal.tsx
+++ b/client/packages/lowcoder/src/comps/queries/queryComp/queryConfirmationModal.tsx
@@ -1,7 +1,7 @@
 import { MultiCompBuilder } from "../../generators";
 import { BoolPureControl } from "../../controls/boolControl";
 import { StringControl } from "../../controls/codeControl";
-import { CustomModal } from "lowcoder-design";
+import { CustomModal, TacoMarkDown } from "lowcoder-design";
 import { isEmpty } from "lodash";
 import { QueryResult } from "../queryComp";
 import { trans } from "i18n";
@@ -16,15 +16,19 @@ export const QueryConfirmationModal = new MultiCompBuilder(
       new Promise<QueryResult>((resolve) => {
         props.showConfirmationModal && isManual
           ? CustomModal.confirm({
-              content: isEmpty(props.confirmationMessage)
-                ? trans("query.confirmationMessage")
-                : props.confirmationMessage,
+              content: (
+                <TacoMarkDown>
+                  {isEmpty(props.confirmationMessage)
+                    ? trans("query.confirmationMessage")
+                    : props.confirmationMessage}
+                </TacoMarkDown>
+              ),
               onConfirm: () => {
                 resolve(onConfirm());
               },
               confirmBtnType: "primary",
               style: { top: "-100px" },
-              bodyStyle: { marginTop: 0, height: "42px" },
+              bodyStyle: { marginTop: 0 },
             })
           : resolve(onConfirm());
       })