In September 1958, grades ten through twelve were moved into the new Edison High School building at 701 Santa Monica street.

Grades seven through nine remained in the old building and became the new student body of John Greenleaf Whittier Junior High School.

In the fall of 2003 students at the junior high moved into temporary facilities next to the school building while new additional construction was completed.

The Academy is partnered with the University of Texas Health Science Center in San Antonio.

The school received national attention in 1995 as it was at the center of the case of United States v. Lopez.