Find the shape handle in plan (the blue dot) and double click on it. That should rejoin the walls without deleting the windows