diff --git a/web/app/components/plugins/plugin-auth/authorized/index.tsx b/web/app/components/plugins/plugin-auth/authorized/index.tsx
index ea58cd16c9..bf5266f4ea 100644
--- a/web/app/components/plugins/plugin-auth/authorized/index.tsx
+++ b/web/app/components/plugins/plugin-auth/authorized/index.tsx
@@ -216,11 +216,13 @@ const Authorized = ({
                 )
           }
         </PortalToFollowElemTrigger>
-        <PortalToFollowElemContent className="z-[100]">
-          <div className={cn(
-            'max-h-[360px] overflow-y-auto rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg',
-            popupClassName,
-          )}
+        <PortalToFollowElemContent className="z-[100]" data-plugin-auth-portal="true">
+          <div
+            className={cn(
+              'max-h-[360px] overflow-y-auto rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg',
+              popupClassName,
+            )}
+            data-plugin-auth-panel="true"
           >
             <div className="py-1">
               {
diff --git a/web/app/components/workflow/skill/editor/skill-editor/plugins/tool-block/component.tsx b/web/app/components/workflow/skill/editor/skill-editor/plugins/tool-block/component.tsx
index abda84bc99..0b861e73be 100644
--- a/web/app/components/workflow/skill/editor/skill-editor/plugins/tool-block/component.tsx
+++ b/web/app/components/workflow/skill/editor/skill-editor/plugins/tool-block/component.tsx
@@ -283,6 +283,8 @@ const ToolBlockComponent: FC<ToolBlockComponentProps> = ({
         return
       if (target instanceof Element && target.closest('[data-readme-panel-root="true"], [data-readme-panel="true"]'))
         return
+      if (target instanceof Element && target.closest('[data-plugin-auth-portal="true"], [data-plugin-auth-panel="true"]'))
+        return
       if (target instanceof Element && target.closest('[data-modal-root="true"]'))
         return
       if (panelEl.contains(target))
@@ -487,7 +489,7 @@ const ToolBlockComponent: FC<ToolBlockComponentProps> = ({
       )}
       {!useModal && portalContainer && isSettingOpen && createPortal(
         <div
-          className="absolute bottom-4 right-4 top-4 z-[999]"
+          className="absolute bottom-4 right-4 top-4 z-[99]"
           data-tool-setting-panel="true"
         >
           <div className={cn('relative h-full min-h-20 w-[361px] overflow-y-auto rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur pb-4 shadow-lg backdrop-blur-sm', 'overflow-y-auto pb-2')}>
diff --git a/web/app/components/workflow/skill/editor/skill-editor/plugins/tool-block/tool-group-block-component.tsx b/web/app/components/workflow/skill/editor/skill-editor/plugins/tool-block/tool-group-block-component.tsx
index 3ff086e738..e94b255b63 100644
--- a/web/app/components/workflow/skill/editor/skill-editor/plugins/tool-block/tool-group-block-component.tsx
+++ b/web/app/components/workflow/skill/editor/skill-editor/plugins/tool-block/tool-group-block-component.tsx
@@ -352,6 +352,8 @@ const ToolGroupBlockComponent: FC<ToolGroupBlockComponentProps> = ({
         return
       if (target instanceof Element && target.closest('[data-readme-panel-root="true"], [data-readme-panel="true"]'))
         return
+      if (target instanceof Element && target.closest('[data-plugin-auth-portal="true"], [data-plugin-auth-panel="true"]'))
+        return
       if (target instanceof Element && target.closest('[data-modal-root="true"]'))
         return
       if (panelEl.contains(target))
@@ -749,7 +751,7 @@ const ToolGroupBlockComponent: FC<ToolGroupBlockComponentProps> = ({
       )}
       {!useModal && portalContainer && isSettingOpen && createPortal(
         <div
-          className="absolute bottom-4 right-4 top-4 z-[999]"
+          className="absolute bottom-4 right-4 top-4 z-[99]"
           data-tool-group-setting-panel="true"
         >
           <div className={cn('relative h-full min-h-20 w-[420px] overflow-y-auto rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur pb-4 shadow-lg backdrop-blur-sm')}>