A crucial component of protein homeostasis in cells is the repair of damaged proteins. The repair of oxygen-evolving photosystem II (PS II) supercomplexes in plant chloroplasts is a prime example of a very efficient repair process that evolved in response to the high vulnerability of PS II to photooxidative damage, exacerbated by high-light (HL) stress. Significant progress in recent years has unraveled individual components and steps that constitute the PS II repair machinery, which is embedded in the thylakoid membrane system inside chloroplasts. However, an open question is how a certain order of these repair steps is established and how unwanted back-reactions that jeopardize the repair efficiency are avoided. Here, we report that spatial separation of key enzymes involved in PS II repair is realized by subcompartmentalization of the thylakoid membrane, accomplished by the formation of stacked grana membranes. The spatial segregation of kinases, phosphatases, proteases, and ribosomes ensures a certain order of events with minimal mutual interference. The margins of the grana turn out to be the site of protein degradation, well separated from active PS II in grana core and de novo protein synthesis in unstacked stroma lamellae. Furthermore, HL induces a partial conversion of stacked grana core to grana margin, which leads to a controlled access of proteases to PS II. Our study suggests that the origin of grana in evolution ensures high repair efficiency, which is essential for PS II homeostasis.photosynthesis | photoinhibition | PS II repair cycle | thylakoid membrane | grana margin R epair of damaged protein complexes is essential for the survival of all living organisms. One of nature's most efficient repair machineries is localized in photosynthetic thylakoid membranes of plants, which can turn over the total pool of the watersplitting photosystem II (PS II) supercomplex in less than 1 h (1). This remarkable potential for protein repair is crucial for the survival and fitness of plants because photodamage by reactive oxygen species is an inherent feature of PS II photochemistry. Significant knowledge gained over the past decade identifies individual steps involved in PS II repair. This progress has led to the formulation of a repair cycle that describes the life cycle of PS II, proceeding from its damage, disassembly, degradation, and resynthesis to its reassembly (2-4).To appreciate the challenges for repairing damaged PS II, it is essential to understand two structural features of the thylakoid membrane system. The first is that functional PS II is organized as a dimeric 1.4-MDa supercomplex in which each monomer consists of at least 28 subunits with two trimeric light harvesting complexes II (LHC II) attached to the core (5, 6). Within this huge supercomplex, the main target of photodamage is the central D1 subunit (7). The PS II repair cycle is therefore mainly designed for specific replacement of the damaged D1, which requires disassembly and reassembly of the whole supercomplex. The second characteri...