An essay by Susan Moller Okin, first published in 1997, sparked theoretical and societal debates on gender equality and multiculturalism. A central issue was whether there is a tension between the two, and if so, which one should take priority and why, while others believed this is the wrong way of posing the question. This chapter reconstructs what was at stake in these debates and what positions can be discerned. Next, we describe how, since then, the debates have broadened in several new, promising ways. There is currently, for instance, much reference to intersectionality. In general, we argue for a more empirically informed discussion of gender and diversity that addresses the experiences and moral perspectives of the persons who are directly involved. We illustrate this with a few examples of how moral dilemmas regarding gender justice and cultural justice play out in real life.