diff --git a/assistants/explorer-assistant/assistant/config.py b/assistants/explorer-assistant/assistant/config.py
index 2c543b81..cdebd360 100644
--- a/assistants/explorer-assistant/assistant/config.py
+++ b/assistants/explorer-assistant/assistant/config.py
@@ -91,7 +91,7 @@ class RequestConfig(BaseModel):
             ),
         ),
         UISchema(enable_markdown_in_description=True),
-    ] = 50_000
+    ] = 128_000
 
     response_tokens: Annotated[
         int,
diff --git a/workbench-app/src/components/Assistants/AssistantConfigure.tsx b/workbench-app/src/components/Assistants/AssistantConfigure.tsx
index 0bb92a54..63b9b1a9 100644
--- a/workbench-app/src/components/Assistants/AssistantConfigure.tsx
+++ b/workbench-app/src/components/Assistants/AssistantConfigure.tsx
@@ -1,10 +1,9 @@
 // Copyright (c) Microsoft. All rights reserved.
 
-import { Button, makeStyles, tokens } from '@fluentui/react-components';
-import { SettingsRegular } from '@fluentui/react-icons';
+import { DialogOpenChangeData, DialogOpenChangeEvent, makeStyles, tokens } from '@fluentui/react-components';
 import React from 'react';
 import { Assistant } from '../../models/Assistant';
-import { CommandButton } from '../App/CommandButton';
+import { DialogControl } from '../App/DialogControl';
 import { AssistantConfiguration } from './AssistantConfiguration';
 
 const useClasses = makeStyles({
@@ -27,55 +26,50 @@ const useClasses = makeStyles({
     },
 });
 
-interface AssistantConfigureProps {
-    assistant: Assistant;
-    iconOnly?: boolean;
-    disabled?: boolean;
-    simulateMenuItem?: boolean;
+interface AssistantConfigureDialogProps {
+    assistant?: Assistant;
+    open: boolean;
+    onOpenChange: (event: DialogOpenChangeEvent, data: DialogOpenChangeData) => void;
 }
 
-export const AssistantConfigure: React.FC<AssistantConfigureProps> = (props) => {
-    const { assistant, iconOnly, disabled, simulateMenuItem } = props;
+export const AssistantConfigureDialog: React.FC<AssistantConfigureDialogProps> = (props) => {
+    const { assistant, open, onOpenChange } = props;
     const classes = useClasses();
-    const [open, setOpen] = React.useState(false);
     const [isDirty, setIsDirty] = React.useState(false);
 
-    const handleClose = React.useCallback(() => {
-        if (isDirty) {
-            const result = window.confirm('Are you sure you want to close without saving?');
-            if (!result) {
+    const handleOpenChange = React.useCallback(
+        (event: DialogOpenChangeEvent, data: DialogOpenChangeData) => {
+            if (data.open) {
+                setIsDirty(false);
                 return;
             }
-        }
-        setOpen(false);
-    }, [isDirty]);
+
+            if (isDirty) {
+                const result = window.confirm('Are you sure you want to close without saving?');
+                if (!result) {
+                    return;
+                }
+            }
+
+            setIsDirty(false);
+            onOpenChange(event, data);
+        },
+        [isDirty, onOpenChange],
+    );
 
     return (
-        <CommandButton
+        <DialogControl
             open={open}
-            onClick={() => setOpen(true)}
-            icon={<SettingsRegular />}
-            simulateMenuItem={simulateMenuItem}
-            label="Configure"
-            iconOnly={iconOnly}
-            disabled={disabled}
-            dialogContent={{
-                title: `Configure "${assistant.name}"`,
-                content: (
-                    <div className={classes.content}>
-                        <AssistantConfiguration assistant={assistant} onIsDirtyChange={setIsDirty} />
-                    </div>
-                ),
-                hideDismissButton: true,
-                classNames: {
-                    dialogSurface: classes.dialogSurface,
-                    dialogContent: classes.dialogContent,
-                },
-                additionalActions: [
-                    <Button key="close" appearance="primary" onClick={handleClose}>
-                        Close
-                    </Button>,
-                ],
+            onOpenChange={handleOpenChange}
+            title={assistant && `Configure "${assistant.name}"`}
+            content={
+                <div className={classes.content}>
+                    {assistant && <AssistantConfiguration assistant={assistant} onIsDirtyChange={setIsDirty} />}
+                </div>
+            }
+            classNames={{
+                dialogSurface: classes.dialogSurface,
+                dialogContent: classes.dialogContent,
             }}
         />
     );
diff --git a/workbench-app/src/components/Assistants/AssistantRemove.tsx b/workbench-app/src/components/Assistants/AssistantRemove.tsx
index de610de4..b8b66982 100644
--- a/workbench-app/src/components/Assistants/AssistantRemove.tsx
+++ b/workbench-app/src/components/Assistants/AssistantRemove.tsx
@@ -1,87 +1,165 @@
 // Copyright (c) Microsoft. All rights reserved.
 
-import { DialogTrigger } from '@fluentui/react-components';
+import { Button, DialogOpenChangeData, DialogOpenChangeEvent } from '@fluentui/react-components';
 import { PlugDisconnectedRegular } from '@fluentui/react-icons';
 import React from 'react';
-import { Conversation } from '../../models/Conversation';
-import { ConversationParticipant } from '../../models/ConversationParticipant';
+import { Utility } from '../../libs/Utility';
+import { useNotify } from '../../libs/useNotify';
+import { Assistant } from '../../models/Assistant';
 import {
     useCreateConversationMessageMutation,
+    useGetConversationParticipantsQuery,
     useRemoveConversationParticipantMutation,
 } from '../../services/workbench';
 import { CommandButton } from '../App/CommandButton';
+import { DialogControl } from '../App/DialogControl';
 
-interface AssistantRemoveProps {
-    participant: ConversationParticipant;
-    conversation: Conversation;
-    iconOnly?: boolean;
-    disabled?: boolean;
-    simulateMenuItem?: boolean;
-}
-
-export const AssistantRemove: React.FC<AssistantRemoveProps> = (props) => {
-    const { participant, conversation, iconOnly, disabled, simulateMenuItem } = props;
-    const [removeConversationParticipant] = useRemoveConversationParticipantMutation();
+const useAssistantRemoveControls = (assistant?: Assistant, conversationId?: string) => {
     const [createConversationMessage] = useCreateConversationMessageMutation();
+    const [removeConversationParticipant] = useRemoveConversationParticipantMutation();
+    const { refetch: refetchParticipants } = useGetConversationParticipantsQuery(conversationId ?? '', {
+        skip: !conversationId,
+    });
     const [submitted, setSubmitted] = React.useState(false);
 
-    const handleAssistantRemove = React.useCallback(async () => {
-        if (submitted) {
-            return;
-        }
-        setSubmitted(true);
+    const handleRemove = React.useCallback(
+        async (onRemove?: (assistant: Assistant) => Promise<void>, onError?: (error: Error) => void) => {
+            if (!assistant || !conversationId || submitted) {
+                return;
+            }
 
-        try {
-            await removeConversationParticipant({
-                conversationId: conversation.id,
-                participantId: participant.id,
-            });
+            try {
+                await Utility.withStatus(setSubmitted, async () => {
+                    await removeConversationParticipant({
+                        conversationId: conversationId,
+                        participantId: assistant.id,
+                    });
+                    await onRemove?.(assistant);
 
-            const content = `${participant.name} removed from conversation`;
+                    const content = `${assistant.name} removed from conversation`;
+                    await createConversationMessage({
+                        conversationId: conversationId,
+                        content,
+                        messageType: 'notice',
+                    });
 
-            await createConversationMessage({
-                conversationId: conversation.id,
-                content,
-                messageType: 'notice',
+                    // Refetch participants to update the assistant name in the list
+                    if (conversationId) {
+                        await refetchParticipants();
+                    }
+                });
+            } catch (error) {
+                onError?.(error as Error);
+            }
+        },
+        [
+            assistant,
+            conversationId,
+            createConversationMessage,
+            refetchParticipants,
+            removeConversationParticipant,
+            submitted,
+        ],
+    );
+
+    const removeAssistantForm = React.useCallback(
+        (onRemove?: (assistant: Assistant) => Promise<void>) => (
+            <form
+                onSubmit={(event) => {
+                    event.preventDefault();
+                    handleRemove(onRemove);
+                }}
+            >
+                <p>
+                    Are you sure you want to remove assistant <strong>{assistant?.name}</strong> from this conversation?
+                </p>
+            </form>
+        ),
+        [assistant?.name, handleRemove],
+    );
+
+    const removeAssistantButton = React.useCallback(
+        (onRemove?: (assistant: Assistant) => Promise<void>, onError?: (error: Error) => void) => (
+            <Button
+                key="remove"
+                disabled={submitted}
+                onClick={() => handleRemove(onRemove, onError)}
+                appearance="primary"
+            >
+                {submitted ? 'Removing...' : 'Remove'}
+            </Button>
+        ),
+        [handleRemove, submitted],
+    );
+
+    return {
+        removeAssistantForm,
+        removeAssistantButton,
+    };
+};
+
+interface AssistantRemoveDialogProps {
+    assistant?: Assistant;
+    conversationId?: string;
+    onRemove?: (assistant: Assistant) => Promise<void>;
+    open: boolean;
+    onOpenChange: (event: DialogOpenChangeEvent, data: DialogOpenChangeData) => void;
+}
+
+export const AssistantRemoveDialog: React.FC<AssistantRemoveDialogProps> = (props) => {
+    const { assistant, conversationId, open, onOpenChange, onRemove } = props;
+    const { removeAssistantForm, removeAssistantButton } = useAssistantRemoveControls(assistant, conversationId);
+    const { notifyWarning } = useNotify();
+
+    const handleError = React.useCallback(
+        (error: Error) => {
+            notifyWarning({
+                id: 'assistant-remove-error',
+                title: 'Remove assistant failed',
+                message: error.message,
             });
-        } finally {
-            setSubmitted(false);
-        }
-    }, [
-        conversation.id,
-        createConversationMessage,
-        participant.id,
-        participant.name,
-        removeConversationParticipant,
-        submitted,
-    ]);
+        },
+        [notifyWarning],
+    );
+
+    return (
+        <DialogControl
+            open={open}
+            onOpenChange={onOpenChange}
+            title="Remove assistant"
+            content={removeAssistantForm(onRemove)}
+            closeLabel="Cancel"
+            additionalActions={[removeAssistantButton(onRemove, handleError)]}
+        />
+    );
+};
+
+interface AssistantRemoveProps {
+    assistant: Assistant;
+    conversationId: string;
+    disabled?: boolean;
+    onRemove?: (assistant: Assistant) => Promise<void>;
+    iconOnly?: boolean;
+    asToolbarButton?: boolean;
+}
+
+export const AssistantRemove: React.FC<AssistantRemoveProps> = (props) => {
+    const { assistant, conversationId, disabled, onRemove, iconOnly, asToolbarButton } = props;
+    const { removeAssistantForm, removeAssistantButton } = useAssistantRemoveControls(assistant, conversationId);
 
     return (
         <CommandButton
+            iconOnly={iconOnly}
             icon={<PlugDisconnectedRegular />}
-            simulateMenuItem={simulateMenuItem}
             label="Remove"
-            iconOnly={iconOnly}
             disabled={disabled}
+            description="Remove assistant"
+            asToolbarButton={asToolbarButton}
             dialogContent={{
-                title: `Remove "${participant.name}"`,
-                content: (
-                    <p>
-                        Are you sure you want to remove assistant <strong>{participant.name}</strong> from this
-                        conversation?
-                    </p>
-                ),
+                title: `Remove "${assistant.name}"`,
+                content: removeAssistantForm(onRemove),
                 closeLabel: 'Cancel',
-                additionalActions: [
-                    <DialogTrigger key="remove" disableButtonEnhancement>
-                        <CommandButton
-                            icon={<PlugDisconnectedRegular />}
-                            disabled={submitted}
-                            label={submitted ? 'Removing...' : 'Remove'}
-                            onClick={handleAssistantRemove}
-                        />
-                    </DialogTrigger>,
-                ],
+                additionalActions: [removeAssistantButton(onRemove)],
             }}
         />
     );
diff --git a/workbench-app/src/components/Assistants/AssistantRename.tsx b/workbench-app/src/components/Assistants/AssistantRename.tsx
index 65964355..b382a379 100644
--- a/workbench-app/src/components/Assistants/AssistantRename.tsx
+++ b/workbench-app/src/components/Assistants/AssistantRename.tsx
@@ -1,79 +1,145 @@
 // Copyright (c) Microsoft. All rights reserved.
 
-import { Button, DialogTrigger, Field, Input } from '@fluentui/react-components';
+import { Button, DialogOpenChangeData, DialogOpenChangeEvent, Field, Input } from '@fluentui/react-components';
 import { EditRegular } from '@fluentui/react-icons';
 import React from 'react';
+import { Utility } from '../../libs/Utility';
+import { useNotify } from '../../libs/useNotify';
 import { Assistant } from '../../models/Assistant';
 import { useGetConversationParticipantsQuery, useUpdateAssistantMutation } from '../../services/workbench';
 import { CommandButton } from '../App/CommandButton';
+import { DialogControl } from '../App/DialogControl';
 
-interface AssistantRenameProps {
-    assistant: Assistant;
-    conversationId?: string;
-    iconOnly?: boolean;
-    simulateMenuItem?: boolean;
-    onRename?: (value: string) => Promise<void>;
-}
-
-export const AssistantRename: React.FC<AssistantRenameProps> = (props) => {
-    const { assistant, conversationId, iconOnly, simulateMenuItem, onRename } = props;
-    const [name, setName] = React.useState(assistant.name);
-    const [submitted, setSubmitted] = React.useState(false);
-    const [open, setOpen] = React.useState(false);
+const useAssistantRenameControls = (assistant?: Assistant, conversationId?: string) => {
     const [updateAssistant] = useUpdateAssistantMutation();
     const { refetch: refetchParticipants } = useGetConversationParticipantsQuery(conversationId ?? '', {
         skip: !conversationId,
     });
+    const [newName, setNewName] = React.useState<string>();
+    const [submitted, setSubmitted] = React.useState(false);
+
+    const handleRename = React.useCallback(
+        async (onRename?: (id: string, value: string) => Promise<void>, onError?: (error: Error) => void) => {
+            if (!assistant || !newName || submitted) {
+                return;
+            }
+
+            try {
+                await Utility.withStatus(setSubmitted, async () => {
+                    await updateAssistant({ ...assistant, name: newName });
+                    await onRename?.(assistant.id, newName);
+
+                    // Refetch participants to update the assistant name in the list
+                    if (conversationId) {
+                        await refetchParticipants();
+                    }
+                });
+            } catch (error) {
+                onError?.(error as Error);
+            }
+        },
+        [assistant, conversationId, newName, refetchParticipants, submitted, updateAssistant],
+    );
+
+    const renameAssistantForm = React.useCallback(
+        (onRename?: (id: string, value: string) => Promise<void>) => (
+            <form
+                onSubmit={(event) => {
+                    event.preventDefault();
+                    handleRename(onRename);
+                }}
+            >
+                <Field label="Name">
+                    <Input
+                        disabled={submitted}
+                        defaultValue={assistant?.name}
+                        onChange={(_event, data) => setNewName(data.value)}
+                    />
+                </Field>
+            </form>
+        ),
+        [assistant?.name, handleRename, submitted],
+    );
+
+    const renameAssistantButton = React.useCallback(
+        (onRename?: (id: string, value: string) => Promise<void>, onError?: (error: Error) => void) => (
+            <Button
+                key="rename"
+                disabled={!newName || submitted}
+                onClick={() => handleRename(onRename, onError)}
+                appearance="primary"
+            >
+                {submitted ? 'Renaming...' : 'Rename'}
+            </Button>
+        ),
+        [handleRename, newName, submitted],
+    );
+
+    return { renameAssistantForm, renameAssistantButton };
+};
+
+interface AssistantRenameDialogProps {
+    assistant?: Assistant;
+    conversationId?: string;
+    onRename?: (value: string) => Promise<void>;
+    open?: boolean;
+    onOpenChange?: (event: DialogOpenChangeEvent, data: DialogOpenChangeData) => void;
+}
 
-    const handleRename = React.useCallback(async () => {
-        if (submitted) {
-            return;
-        }
-        setSubmitted(true);
-        await updateAssistant({ ...assistant, name });
+export const AssistantRenameDialog: React.FC<AssistantRenameDialogProps> = (props) => {
+    const { assistant, conversationId, onRename, open, onOpenChange } = props;
+    const { renameAssistantForm, renameAssistantButton } = useAssistantRenameControls(assistant, conversationId);
+    const { notifyWarning } = useNotify();
 
-        // Refetch participants to update the assistant name in the list
-        if (conversationId) {
-            await refetchParticipants();
-        }
+    const handleError = React.useCallback(
+        (error: Error) => {
+            notifyWarning({
+                id: 'assistant-rename-error',
+                title: 'Rename assistant failed',
+                message: error.message,
+            });
+        },
+        [notifyWarning],
+    );
 
-        await onRename?.(name);
-        setOpen(false);
-        setSubmitted(false);
-    }, [assistant, conversationId, name, onRename, refetchParticipants, submitted, updateAssistant]);
+    return (
+        <DialogControl
+            open={open}
+            onOpenChange={onOpenChange}
+            title="Rename assistant"
+            content={renameAssistantForm(onRename)}
+            closeLabel="Cancel"
+            additionalActions={[renameAssistantButton(onRename, handleError)]}
+        />
+    );
+};
+
+interface AssistantRenameProps {
+    assistant: Assistant;
+    conversationId?: string;
+    disabled?: boolean;
+    onRename?: (value: string) => Promise<void>;
+    iconOnly?: boolean;
+    asToolbarButton?: boolean;
+}
+
+export const AssistantRename: React.FC<AssistantRenameProps> = (props) => {
+    const { assistant, conversationId, disabled, onRename, iconOnly, asToolbarButton } = props;
+    const { renameAssistantForm, renameAssistantButton } = useAssistantRenameControls(assistant, conversationId);
 
     return (
         <CommandButton
-            open={open}
-            onClick={() => setOpen(true)}
+            iconOnly={iconOnly}
             icon={<EditRegular />}
             label="Rename"
-            iconOnly={iconOnly}
-            simulateMenuItem={simulateMenuItem}
+            disabled={disabled}
             description="Rename assistant"
+            asToolbarButton={asToolbarButton}
             dialogContent={{
-                title: 'Rename Assistant',
-                content: (
-                    <form
-                        onSubmit={(event) => {
-                            event.preventDefault();
-                            handleRename();
-                        }}
-                    >
-                        <Field label="Name">
-                            <Input disabled={submitted} value={name} onChange={(_event, data) => setName(data.value)} />
-                        </Field>
-                        <button disabled={!name || submitted} type="submit" hidden />
-                    </form>
-                ),
+                title: `Rename assistant`,
+                content: renameAssistantForm(onRename),
                 closeLabel: 'Cancel',
-                additionalActions: [
-                    <DialogTrigger key="rename" disableButtonEnhancement>
-                        <Button disabled={!name || submitted} onClick={handleRename} appearance="primary">
-                            {submitted ? 'Renaming...' : 'Rename'}
-                        </Button>
-                    </DialogTrigger>,
-                ],
+                additionalActions: [renameAssistantButton(onRename)],
             }}
         />
     );
diff --git a/workbench-app/src/components/Assistants/AssistantServiceInfo.tsx b/workbench-app/src/components/Assistants/AssistantServiceInfo.tsx
index 8d5c49b7..15586fbe 100644
--- a/workbench-app/src/components/Assistants/AssistantServiceInfo.tsx
+++ b/workbench-app/src/components/Assistants/AssistantServiceInfo.tsx
@@ -1,34 +1,27 @@
 // Copyright (c) Microsoft. All rights reserved.
 
-import { DatabaseRegular } from '@fluentui/react-icons';
+import { DialogOpenChangeData, DialogOpenChangeEvent } from '@fluentui/react-components';
 import React from 'react';
 import { Assistant } from '../../models/Assistant';
-import { CommandButton } from '../App/CommandButton';
+import { DialogControl } from '../App/DialogControl';
 import { AssistantServiceMetadata } from './AssistantServiceMetadata';
 
-interface AssistantServiceInfoProps {
-    assistant: Assistant;
-    iconOnly?: boolean;
-    disabled?: boolean;
-    simulateMenuItem?: boolean;
+interface AssistantServiceInfoDialogProps {
+    assistant?: Assistant;
+    open: boolean;
+    onOpenChange: (event: DialogOpenChangeEvent, data: DialogOpenChangeData) => void;
 }
 
-export const AssistantServiceInfo: React.FC<AssistantServiceInfoProps> = (props) => {
-    const { assistant, iconOnly, disabled, simulateMenuItem } = props;
+export const AssistantServiceInfoDialog: React.FC<AssistantServiceInfoDialogProps> = (props) => {
+    const { assistant, open, onOpenChange } = props;
 
     return (
-        <CommandButton
-            icon={<DatabaseRegular />}
-            simulateMenuItem={simulateMenuItem}
-            label="Service Info"
-            iconOnly={iconOnly}
-            description="View assistant service info"
-            disabled={disabled}
-            dialogContent={{
-                title: `"${assistant.name}" Service Info`,
-                content: <AssistantServiceMetadata assistantServiceId={assistant.assistantServiceId} />,
-                closeLabel: 'Close',
-            }}
+        <DialogControl
+            open={open}
+            onOpenChange={onOpenChange}
+            title={assistant && `"${assistant?.name}" Service Info`}
+            content={assistant && <AssistantServiceMetadata assistantServiceId={assistant.assistantServiceId} />}
+            closeLabel="Close"
         />
     );
 };
diff --git a/workbench-app/src/components/Conversations/ConversationRename.tsx b/workbench-app/src/components/Conversations/ConversationRename.tsx
index 46151a58..2ede476f 100644
--- a/workbench-app/src/components/Conversations/ConversationRename.tsx
+++ b/workbench-app/src/components/Conversations/ConversationRename.tsx
@@ -80,7 +80,7 @@ export const ConversationRenameDialog: React.FC<ConversationRenameDialogProps> =
     const handleError = React.useCallback(
         (error: Error) => {
             notifyWarning({
-                id: 'error',
+                id: 'conversation-rename-error',
                 title: 'Rename conversation failed',
                 message: error.message,
             });
diff --git a/workbench-app/src/components/Conversations/ParticipantItem.tsx b/workbench-app/src/components/Conversations/ParticipantItem.tsx
index ecc45c93..a02928ee 100644
--- a/workbench-app/src/components/Conversations/ParticipantItem.tsx
+++ b/workbench-app/src/components/Conversations/ParticipantItem.tsx
@@ -3,6 +3,7 @@
 import {
     Button,
     Menu,
+    MenuItem,
     MenuList,
     MenuPopover,
     MenuTrigger,
@@ -10,16 +11,19 @@ import {
     makeStyles,
     tokens,
 } from '@fluentui/react-components';
-import { MoreHorizontalRegular } from '@fluentui/react-icons';
+import {
+    DatabaseRegular,
+    EditRegular,
+    MoreHorizontalRegular,
+    PlugDisconnectedRegular,
+    SettingsRegular,
+} from '@fluentui/react-icons';
 import React from 'react';
 import { useParticipantUtility } from '../../libs/useParticipantUtility';
+import { Assistant } from '../../models/Assistant';
 import { Conversation } from '../../models/Conversation';
 import { ConversationParticipant } from '../../models/ConversationParticipant';
 import { useGetAssistantQuery } from '../../services/workbench';
-import { AssistantConfigure } from '../Assistants/AssistantConfigure';
-import { AssistantRemove } from '../Assistants/AssistantRemove';
-import { AssistantRename } from '../Assistants/AssistantRename';
-import { AssistantServiceInfo } from '../Assistants/AssistantServiceInfo';
 
 const useClasses = makeStyles({
     root: {
@@ -44,11 +48,14 @@ interface ParticipantItemProps {
     conversation: Conversation;
     participant: ConversationParticipant;
     readOnly?: boolean;
-    preventAssistantModifyOnParticipantIds?: string[];
+    onConfigure?: (assistant: Assistant) => void;
+    onRename?: (assistant: Assistant) => void;
+    onServiceInfo?: (assistant: Assistant) => void;
+    onRemove?: (assistant: Assistant) => void;
 }
 
 export const ParticipantItem: React.FC<ParticipantItemProps> = (props) => {
-    const { conversation, participant, readOnly, preventAssistantModifyOnParticipantIds } = props;
+    const { conversation, participant, readOnly, onConfigure, onRename, onServiceInfo, onRemove } = props;
     const classes = useClasses();
     const { getAvatarData } = useParticipantUtility();
 
@@ -61,8 +68,16 @@ export const ParticipantItem: React.FC<ParticipantItemProps> = (props) => {
         throw new Error(`Error loading assistant (${participant.id}): ${errorMessage}`);
     }
 
+    const handleMenuItemClick = React.useCallback(
+        (event: React.MouseEvent<HTMLDivElement>, handler?: (conversation: Conversation) => void) => {
+            event.stopPropagation();
+            handler?.(conversation);
+        },
+        [conversation],
+    );
+
     const assistantActions = React.useMemo(() => {
-        if (participant.role !== 'assistant') {
+        if (participant.role !== 'assistant' || !assistant || readOnly) {
             return null;
         }
 
@@ -73,34 +88,44 @@ export const ParticipantItem: React.FC<ParticipantItemProps> = (props) => {
                 </MenuTrigger>
                 <MenuPopover>
                     <MenuList>
-                        {assistant && (
-                            <>
-                                <AssistantConfigure
-                                    assistant={assistant}
-                                    disabled={
-                                        readOnly || preventAssistantModifyOnParticipantIds?.includes(participant.id)
-                                    }
-                                    simulateMenuItem
-                                />
-                                <AssistantRename
-                                    assistant={assistant}
-                                    conversationId={conversation.id}
-                                    simulateMenuItem
-                                />
-                                <AssistantServiceInfo assistant={assistant} simulateMenuItem />
-                            </>
+                        {/* FIXME: complete the menu items */}
+                        {onConfigure && (
+                            <MenuItem
+                                icon={<SettingsRegular />}
+                                onClick={(event) => handleMenuItemClick(event, () => onConfigure(assistant))}
+                            >
+                                Configure
+                            </MenuItem>
+                        )}
+                        {onRename && (
+                            <MenuItem
+                                icon={<EditRegular />}
+                                onClick={(event) => handleMenuItemClick(event, () => onRename(assistant))}
+                            >
+                                Rename
+                            </MenuItem>
+                        )}
+                        {onServiceInfo && (
+                            <MenuItem
+                                icon={<DatabaseRegular />}
+                                onClick={(event) => handleMenuItemClick(event, () => onServiceInfo(assistant))}
+                            >
+                                Service Info
+                            </MenuItem>
+                        )}
+                        {onRemove && (
+                            <MenuItem
+                                icon={<PlugDisconnectedRegular />}
+                                onClick={(event) => handleMenuItemClick(event, () => onRemove(assistant))}
+                            >
+                                Remove
+                            </MenuItem>
                         )}
-                        <AssistantRemove
-                            conversation={conversation}
-                            participant={participant}
-                            disabled={readOnly || preventAssistantModifyOnParticipantIds?.includes(participant.id)}
-                            simulateMenuItem
-                        />
                     </MenuList>
                 </MenuPopover>
             </Menu>
         );
-    }, [assistant, conversation, participant, preventAssistantModifyOnParticipantIds, readOnly]);
+    }, [participant.role, assistant, readOnly, onConfigure, onRename, onServiceInfo, onRemove, handleMenuItemClick]);
 
     return (
         <div className={classes.participant} key={participant.id}>
diff --git a/workbench-app/src/components/Conversations/ParticipantList.tsx b/workbench-app/src/components/Conversations/ParticipantList.tsx
index be881156..e49c6466 100644
--- a/workbench-app/src/components/Conversations/ParticipantList.tsx
+++ b/workbench-app/src/components/Conversations/ParticipantList.tsx
@@ -8,6 +8,10 @@ import { Conversation } from '../../models/Conversation';
 import { ConversationParticipant } from '../../models/ConversationParticipant';
 import { useAddConversationParticipantMutation, useCreateConversationMessageMutation } from '../../services/workbench';
 import { AssistantAdd } from '../Assistants/AssistantAdd';
+import { AssistantConfigureDialog } from '../Assistants/AssistantConfigure';
+import { AssistantRemoveDialog } from '../Assistants/AssistantRemove';
+import { AssistantRenameDialog } from '../Assistants/AssistantRename';
+import { AssistantServiceInfoDialog } from '../Assistants/AssistantServiceInfo';
 import { ParticipantItem } from './ParticipantItem';
 
 const useClasses = makeStyles({
@@ -45,6 +49,11 @@ export const ParticipantList: React.FC<ParticipantListProps> = (props) => {
     const [addConversationParticipant] = useAddConversationParticipantMutation();
     const [createConversationMessage] = useCreateConversationMessageMutation();
 
+    const [configureAssistant, setConfigureAssistant] = React.useState<Assistant>();
+    const [renameAssistant, setRenameAssistant] = React.useState<Assistant>();
+    const [serviceInfoAssistant, setServiceInfoAssistant] = React.useState<Assistant>();
+    const [removeAssistant, setRemoveAssistant] = React.useState<Assistant>();
+
     const handleAssistantAdd = async (assistant: Assistant) => {
         // send notice message first, to announce before assistant reacts to create event
         await createConversationMessage({
@@ -59,20 +68,56 @@ export const ParticipantList: React.FC<ParticipantListProps> = (props) => {
         });
     };
 
+    const actionHelpers = React.useMemo(
+        () => (
+            <>
+                <AssistantConfigureDialog
+                    assistant={configureAssistant}
+                    open={configureAssistant !== undefined}
+                    onOpenChange={() => setConfigureAssistant(undefined)}
+                />
+                <AssistantRenameDialog
+                    assistant={renameAssistant}
+                    conversationId={conversation.id}
+                    open={renameAssistant !== undefined}
+                    onOpenChange={() => setRenameAssistant(undefined)}
+                    onRename={async () => setRenameAssistant(undefined)}
+                />
+                <AssistantServiceInfoDialog
+                    assistant={serviceInfoAssistant}
+                    open={serviceInfoAssistant !== undefined}
+                    onOpenChange={() => setServiceInfoAssistant(undefined)}
+                />
+                <AssistantRemoveDialog
+                    assistant={removeAssistant}
+                    conversationId={conversation.id}
+                    open={removeAssistant !== undefined}
+                    onOpenChange={() => setRemoveAssistant(undefined)}
+                    onRemove={async () => setRemoveAssistant(undefined)}
+                />
+            </>
+        ),
+        [configureAssistant, conversation.id, removeAssistant, renameAssistant, serviceInfoAssistant],
+    );
+
     const exceptAssistantIds = participants
         .filter((participant) => participant.active && participant.role === 'assistant')
         .map((participant) => participant.id);
 
     return (
         <div className={classes.root}>
+            {actionHelpers}
             <AssistantAdd disabled={readOnly} exceptAssistantIds={exceptAssistantIds} onAdd={handleAssistantAdd} />
             {sortParticipants(participants).map((participant) => (
                 <ParticipantItem
                     key={participant.id}
                     conversation={conversation}
                     participant={participant}
-                    readOnly={readOnly}
-                    preventAssistantModifyOnParticipantIds={preventAssistantModifyOnParticipantIds}
+                    readOnly={readOnly || preventAssistantModifyOnParticipantIds?.includes(participant.id)}
+                    onConfigure={(assistant) => setConfigureAssistant(assistant)}
+                    onRename={(assistant) => setRenameAssistant(assistant)}
+                    onServiceInfo={(assistant) => setServiceInfoAssistant(assistant)}
+                    onRemove={(assistant) => setRemoveAssistant(assistant)}
                 />
             ))}
         </div>