After a brief stay at Ryukyu Islands for battle damage repairs, Gwin returned to patrol and sweeping duties around Okinawa. She rendezvoused 20 August with Task Force 35 and headed for Tokyo Bay. Putting into Sagami Bay 27 August 1945, Gwin began to sweep the area and destroyed some 41 mines in 2 days duty. At last on 2 August 1945 she steamed into Tokyo Bay, and anchored under the towering snowcap of Mount Fuji. Departing for Okinawa 1 September, Gwin, remained on minesweeping duty there and in the East China Sea for the rest of the year.