Choosing a watch face always starts with the first IQ face

If you are using an IQ face when you long press the lower right button to edit it (or select a new one) the list always starts with your first IQ face. Then you have to scroll right through many other faces just to get back the the current face. This started happening for me a few firmware updates ago. Anyone else?