ui fix for #1367 and potentially #1222