Fix close shortcuts targeting original window - #4615

Bugbot Analysis Progress (7m 36s elapsed)

✅ Gathered PR context (3s)
✅ Completed bug detection (7m 32s)
✅ Posted analysis results (0s)

Final Result: Bugbot completed review - no issues found! ✅

Request ID: serverGenReqId_adc1d621-9ece-4410-a4fd-4a6534f901dc