On 18 March, the destroyer was back with the carriers for raids on the Nansei Shoto in preparation for the upcoming Okinawa campaign. On 1 April, they provided close support as troops landed on that enemy bastion. "McNair" remained off Okinawa to aid in fighting off the daily air attacks until 27 April, when she returned to Ulithi for repairs. Returning to Okinawa on 25 May, she conducted further shore bombardment and antiaircraft patrol missions before returning on 13 June to Leyte, the staging area of the fast carriers’ last deployment against Japan.