Reduce saveLastWindow calls