Fix #1187 Selecting an instrument for a new WS does not stick