diff --git a/src/chainlit/frontend/src/components/chat/message/detailsButton.tsx b/src/chainlit/frontend/src/components/chat/message/detailsButton.tsx
index f667aead7c..642d56d35c 100644
--- a/src/chainlit/frontend/src/components/chat/message/detailsButton.tsx
+++ b/src/chainlit/frontend/src/components/chat/message/detailsButton.tsx
@@ -21,18 +21,32 @@ export default function DetailsButton({
 }: Props) {
   const pSettings = useRecoilValue(projectSettingsState);
 
-  const nested = !!message.subMessages?.length;
+  const nestedCount = message.subMessages?.length;
+  const nested = !!nestedCount;
 
-  const tool = nested ? message.subMessages![0].author : undefined;
+  const tool = nested
+    ? message.subMessages![nestedCount - 1].author
+    : undefined;
 
-  const show =
-    nested || (loading && (!message.content || message.authorIsUser));
+  const isRunningEmptyStep = loading && !message.content;
+  const isRunningUserMessage = loading && message.authorIsUser;
+
+  const show = nested || isRunningEmptyStep || isRunningUserMessage;
 
   if (!show || pSettings?.hideCot) {
     return null;
   }
 
-  const text = loading ? (tool ? `Using ${tool}` : 'Running') : `Used ${tool}`;
+  // Don't count empty steps
+  const stepCount = nestedCount
+    ? message.subMessages!.filter((m) => !!m.content).length
+    : 0;
+
+  const text = loading
+    ? tool
+      ? `Using ${tool}`
+      : 'Running'
+    : `Took ${stepCount} step${stepCount <= 1 ? '' : 's'}`;
 
   let id = '';
   if (tool) {
diff --git a/src/chainlit/frontend/src/components/chat/stopButton.tsx b/src/chainlit/frontend/src/components/chat/stopButton.tsx
index 203aa4cbac..b76bc44eef 100644
--- a/src/chainlit/frontend/src/components/chat/stopButton.tsx
+++ b/src/chainlit/frontend/src/components/chat/stopButton.tsx
@@ -2,15 +2,13 @@ import CloseIcon from '@mui/icons-material/Close';
 import { Box } from '@mui/material';
 import { useRecoilState, useRecoilValue } from 'recoil';
 import { loadingState, sessionState } from 'state/chat';
-import { projectSettingsState } from 'state/project';
 import GreyButton from 'components/greyButton';
 
 export default function StopButton() {
   const [loading, setLoading] = useRecoilState(loadingState);
-  const pSettings = useRecoilValue(projectSettingsState);
   const session = useRecoilValue(sessionState);
 
-  if (!loading || pSettings?.hideCot) {
+  if (!loading) {
     return null;
   }