diff --git a/web/app/(commonLayout)/apps/AppCard.tsx b/web/app/(commonLayout)/apps/AppCard.tsx
index 53e24f0b89..1d5415508b 100644
--- a/web/app/(commonLayout)/apps/AppCard.tsx
+++ b/web/app/(commonLayout)/apps/AppCard.tsx
@@ -177,7 +177,7 @@ const AppCard = ({ app, onRefresh }: AppCardProps) => {
           <span className={s.actionName}>{t('common.operation.settings')}</span>
         </button>
         <Divider className="!my-1" />
-        {app.mode !== 'completion' && (
+        {(app.mode === 'workflow' || app.mode === 'agent-chat' || app.mode === 'advanced-chat' || (app.mode === 'chat' && detailState.detail?.model_config.prompt_type === 'simple')) && (
           <>
             <button className={s.actionItem} onClick={onClickDuplicate} disabled={detailState.loading}>
               <span className={s.actionName}>{t('app.duplicate')}</span>
@@ -221,6 +221,10 @@ const AppCard = ({ app, onRefresh }: AppCardProps) => {
             <div className={style.listItemHeadingContent}>{app.name}</div>
           </div>
           {isCurrentWorkspaceManager && <CustomPopover
+            onTriggerClick={() => {
+              if (app.mode === 'chat' && !detailState.detail)
+                getAppDetail()
+            }}
             htmlContent={<Operations />}
             position="br"
             trigger="click"
diff --git a/web/app/components/app-sidebar/app-info.tsx b/web/app/components/app-sidebar/app-info.tsx
index 9d9d38fb04..567f9796a9 100644
--- a/web/app/components/app-sidebar/app-info.tsx
+++ b/web/app/components/app-sidebar/app-info.tsx
@@ -177,7 +177,10 @@ const AppInfo = ({ expand }: IAppInfoProps) => {
                     </>
                   )}
                   {appDetail.mode === 'completion' && (
-                    <div className='shrink-0 px-1 border bg-white border-[rgba(0,0,0,0.08)] rounded-[5px] truncate'>{t('app.types.completion').toUpperCase()}</div>
+                    <>
+                      <div className='shrink-0 px-1 border bg-white border-[rgba(0,0,0,0.08)] rounded-[5px] truncate'>{t('app.types.completion').toUpperCase()}</div>
+                      <div title={t('app.newApp.basic') || ''} className='px-1 border bg-white border-[rgba(0,0,0,0.08)] rounded-[5px] truncate'>{(t('app.newApp.basic').toUpperCase())}</div>
+                    </>
                   )}
                   {appDetail.mode === 'workflow' && (
                     <div className='shrink-0 px-1 border bg-white border-[rgba(0,0,0,0.08)] rounded-[5px] truncate'>{t('app.types.workflow').toUpperCase()}</div>
@@ -213,7 +216,10 @@ const AppInfo = ({ expand }: IAppInfoProps) => {
                     </>
                   )}
                   {appDetail.mode === 'completion' && (
-                    <div className='shrink-0 px-1 border bg-white border-[rgba(0,0,0,0.08)] rounded-[5px] truncate'>{t('app.types.completion').toUpperCase()}</div>
+                    <>
+                      <div className='shrink-0 px-1 border bg-white border-[rgba(0,0,0,0.08)] rounded-[5px] truncate'>{t('app.types.completion').toUpperCase()}</div>
+                      <div title={t('app.newApp.basic') || ''} className='px-1 border bg-white border-[rgba(0,0,0,0.08)] rounded-[5px] truncate'>{(t('app.newApp.basic').toUpperCase())}</div>
+                    </>
                   )}
                   {appDetail.mode === 'workflow' && (
                     <div className='shrink-0 px-1 border bg-white border-[rgba(0,0,0,0.08)] rounded-[5px] truncate'>{t('app.types.workflow').toUpperCase()}</div>
diff --git a/web/app/components/app/configuration/index.tsx b/web/app/components/app/configuration/index.tsx
index 97ec479894..a5e0dbb7c7 100644
--- a/web/app/components/app/configuration/index.tsx
+++ b/web/app/components/app/configuration/index.tsx
@@ -441,7 +441,7 @@ const Configuration: FC = () => {
             model_id: model.name,
             mode: model.mode,
             configs: {
-              prompt_template: modelConfig.pre_prompt,
+              prompt_template: modelConfig.pre_prompt || '',
               prompt_variables: userInputsFormToPromptVariables(
                 [
                   ...modelConfig.user_input_form,
diff --git a/web/app/components/base/popover/index.tsx b/web/app/components/base/popover/index.tsx
index 26d17c4405..cf85926623 100644
--- a/web/app/components/base/popover/index.tsx
+++ b/web/app/components/base/popover/index.tsx
@@ -17,6 +17,7 @@ type IPopover = {
   btnElement?: string | React.ReactNode
   btnClassName?: string | ((open: boolean) => string)
   manualClose?: boolean
+  onTriggerClick?: () => void
 }
 
 const timeoutDuration = 100
@@ -30,6 +31,7 @@ export default function CustomPopover({
   className,
   btnClassName,
   manualClose,
+  onTriggerClick,
 }: IPopover) {
   const buttonRef = useRef<HTMLButtonElement>(null)
   const timeOutRef = useRef<NodeJS.Timeout | null>(null)
@@ -66,6 +68,10 @@ export default function CustomPopover({
                     ? btnClassName
                     : btnClassName?.(open)
                 }`}
+                onClick={() => {
+                  if (!open)
+                    onTriggerClick && onTriggerClick()
+                }}
               >
                 {btnElement}
               </Popover.Button>