Residential segregation accounts for most school segregation. School choice policies have the potential to decrease school segregation by allowing students to attend schools outside their neighborhoods. However, some research indicates that these policies can also contribute to increased segregation, likely due to differences in access to choice and preferences for schools by race and socioeconomic status. This study focuses on Michigan's school choice landscape, analyzing student-level data from 2009-2019 to determine the impact of inter-district and charter school choice on segregation patterns. Findings include: (1) increased charter school enrollment is linked with higher within-district racial and economic segregation; (2) inter-district enrollment increases economic segregation in districts without charter schools but, in regions with charter schools it can help reduce racial segregation across districts; and (3) trends in school segregation are partially explained by Black and economically disadvantaged students attending schools with more same race or more historically advantaged students.