diff --git a/web/app/components/plugins/reference-setting-modal/auto-update-setting/no-plugin-selected.tsx b/web/app/components/plugins/reference-setting-modal/auto-update-setting/no-plugin-selected.tsx
index e255be052..233801423 100644
--- a/web/app/components/plugins/reference-setting-modal/auto-update-setting/no-plugin-selected.tsx
+++ b/web/app/components/plugins/reference-setting-modal/auto-update-setting/no-plugin-selected.tsx
@@ -14,7 +14,7 @@ const NoPluginSelected: FC<Props> = ({
   const { t } = useTranslation()
   const text = `${t(`plugin.autoUpdate.upgradeModePlaceholder.${updateMode === AUTO_UPDATE_MODE.partial ? 'partial' : 'exclude'}`)}`
   return (
-    <div className='system-xs-regular rounded-[10px] border border-[divider-subtle] bg-background-section p-3 text-center text-text-tertiary'>
+    <div className='system-xs-regular rounded-[10px] border border-components-option-card-option-border bg-background-section p-3 text-center text-text-tertiary'>
       {text}
     </div>
   )
diff --git a/web/app/components/plugins/reference-setting-modal/auto-update-setting/plugins-picker.tsx b/web/app/components/plugins/reference-setting-modal/auto-update-setting/plugins-picker.tsx
index 77ffd6667..097592c1c 100644
--- a/web/app/components/plugins/reference-setting-modal/auto-update-setting/plugins-picker.tsx
+++ b/web/app/components/plugins/reference-setting-modal/auto-update-setting/plugins-picker.tsx
@@ -53,7 +53,7 @@ const PluginsPicker: FC<Props> = ({
 
       <ToolPicker
         trigger={
-          <Button className='mt-2 w-[412px]' size='small' variant='secondary-accent'>
+          <Button className='mt-2 w-full' size='small' variant='secondary-accent'>
             <RiAddLine className='size-3.5' />
             {t(`${i18nPrefix}.operation.select`)}
           </Button>
diff --git a/web/app/components/plugins/reference-setting-modal/auto-update-setting/tool-picker.tsx b/web/app/components/plugins/reference-setting-modal/auto-update-setting/tool-picker.tsx
index 0e48a07f4..ed8ae6411 100644
--- a/web/app/components/plugins/reference-setting-modal/auto-update-setting/tool-picker.tsx
+++ b/web/app/components/plugins/reference-setting-modal/auto-update-setting/tool-picker.tsx
@@ -58,6 +58,14 @@ const ToolPicker: FC<Props> = ({
       key: PLUGIN_TYPE_SEARCH_MAP.extension,
       name: t('plugin.category.extensions'),
     },
+    {
+      key: PLUGIN_TYPE_SEARCH_MAP.datasource,
+      name: t('plugin.category.datasources'),
+    },
+    {
+      key: PLUGIN_TYPE_SEARCH_MAP.trigger,
+      name: t('plugin.category.triggers'),
+    },
     {
       key: PLUGIN_TYPE_SEARCH_MAP.bundle,
       name: t('plugin.category.bundles'),
@@ -119,12 +127,13 @@ const ToolPicker: FC<Props> = ({
       onOpenChange={onShowChange}
     >
       <PortalToFollowElemTrigger
+        className='block w-full'
         onClick={toggleShowPopup}
       >
         {trigger}
       </PortalToFollowElemTrigger>
       <PortalToFollowElemContent className='z-[1000]'>
-        <div className={cn('relative min-h-20 w-[436px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur pb-2 shadow-lg backdrop-blur-sm')}>
+        <div className={cn('relative min-h-20 w-full rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur pb-2 shadow-lg backdrop-blur-sm')}>
           <div className='p-2 pb-1'>
             <SearchBox
               search={query}