Fix selection highlight for non-key state