diff --git a/src/date-picker/DateRangePicker.tsx b/src/date-picker/DateRangePicker.tsx
index b95b49ea7..b40fc9dc2 100644
--- a/src/date-picker/DateRangePicker.tsx
+++ b/src/date-picker/DateRangePicker.tsx
@@ -102,6 +102,7 @@ export default defineComponent({
           if (month.value.length === 1) month.value = [month.value[0], Math.min(month.value[0] + 1, 11)];
         }
       } else {
+        activeIndex.value = 0;
         isHoverCell.value = false;
         isFirstValueSelected.value = false;
         inputValue.value = formatDate(value.value, {
diff --git a/src/date-picker/hooks/useRange.ts b/src/date-picker/hooks/useRange.ts
index 2386652f2..5b4663497 100644
--- a/src/date-picker/hooks/useRange.ts
+++ b/src/date-picker/hooks/useRange.ts
@@ -152,6 +152,7 @@ export default function useRange(props: TdDateRangePickerProps, { emit }: any) {
       isMountedRef.value = true;
       return;
     }
+    if (!popupVisible.value) return;
     const indexMap = { 0: 'first', 1: 'second' };
     inputRef.value?.focus?.({ position: indexMap[index] });
   });