diff --git a/dashboard/src/components/chat/CommandSuggestion.vue b/dashboard/src/components/chat/CommandSuggestion.vue
index 87035ef08a..4bb53b0930 100644
--- a/dashboard/src/components/chat/CommandSuggestion.vue
+++ b/dashboard/src/components/chat/CommandSuggestion.vue
@@ -47,7 +47,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, reactive } from "vue";
+import { computed, reactive, ref, watch } from "vue";
 import { useModuleI18n } from "@/i18n/composables";
 
 export interface SuggestionCommand {
@@ -88,6 +88,8 @@ const tooltip = reactive({
   y: 0,
 });
 
+const hoveredKey = ref<string | null>(null);
+
 const tooltipStyle = computed(() => ({
   position: "fixed" as const,
   left: `${tooltip.x + 12}px`,
@@ -113,6 +115,30 @@ const panelStyle = computed(() => {
   };
 });
 
+watch(
+  () => props.visible,
+  (val) => {
+    if (!val) {
+      tooltip.visible = false;
+    }
+  },
+);
+
+watch(
+  () => props.commands,
+  (cmds) => {
+    if (hoveredKey.value) {
+      const stillExists = cmds.some(
+        (c) => `${c.handler_full_name}:${c.effective_command}` === hoveredKey.value,
+      );
+      if (!stillExists) {
+        tooltip.visible = false;
+        hoveredKey.value = null;
+      }
+    }
+  },
+);
+
 function handleSelect(index: number) {
   const cmd = props.commands[index];
   if (cmd) {
@@ -122,11 +148,13 @@ function handleSelect(index: number) {
 
 function handleMouseEnter(index: number) {
   emit("updateSelectedIndex", index);
-  // 显示 tooltip
   const cmd = props.commands[index];
-  if (cmd?.description) {
-    tooltip.text = cmd.description;
-    tooltip.visible = true;
+  if (cmd) {
+    hoveredKey.value = `${cmd.handler_full_name}:${cmd.effective_command}`;
+    if (cmd.description) {
+      tooltip.text = cmd.description;
+      tooltip.visible = true;
+    }
   }
 }
 
@@ -137,6 +165,7 @@ function handleMouseMove(e: MouseEvent) {
 
 function handleMouseLeave() {
   tooltip.visible = false;
+  hoveredKey.value = null;
 }
 </script>
 
@@ -224,7 +253,7 @@ function handleMouseLeave() {
 }
 
 .is-dark .command-description {
-  color: #999;
+  color: #e0e0e0;
 }
 
 .command-suggestion-hint {