Abstract: A stemware support/cup shelf assembly disposed on a washware rack for supporting stemware and which also serves as a cup shelf, including: a frame having a front edge portion with a plurality of notches which support stemware, an upper shelf portion which serves as a cup shelf, and a rear edge portion having a pair of mounts for mounting the stemware support/cup shelf assembly to a side wall portion of the washware rack. Each of the pair of mounts is configured to allow the frame to rotate upward from a stowed position into a working angle position and then slide horizontally into a final locked position.