fix: fix focus on window exit and then return (#2528)

fix: fix focus on window exit and then return (#2528) #737