diff --git a/webview-ui/src/components/chat/ChatView.tsx b/webview-ui/src/components/chat/ChatView.tsx
index 19b7613b3e..37e915d735 100644
--- a/webview-ui/src/components/chat/ChatView.tsx
+++ b/webview-ui/src/components/chat/ChatView.tsx
@@ -387,7 +387,12 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 							setSendingDisabled(isPartial)
 							setClineAsk("completion_result")
 							setEnableButtons(!isPartial)
-							setPrimaryButtonText(t("chat:startNewTask.title"))
+							// Check if current task has a parent task to return to
+							setPrimaryButtonText(
+								currentTaskItem?.parentTaskId
+									? t("chat:completeSubtaskAndReturn")
+									: t("chat:startNewTask.title"),
+							)
 							setSecondaryButtonText(undefined)
 							break
 						case "resume_task":
@@ -402,7 +407,12 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 							setSendingDisabled(false)
 							setClineAsk("resume_completed_task")
 							setEnableButtons(true)
-							setPrimaryButtonText(t("chat:startNewTask.title"))
+							// Check if current task has a parent task to return to
+							setPrimaryButtonText(
+								currentTaskItem?.parentTaskId
+									? t("chat:completeSubtaskAndReturn")
+									: t("chat:startNewTask.title"),
+							)
 							setSecondaryButtonText(undefined)
 							setDidClickCancel(false)
 							break