Fix more selection trouble in iOS6 and 7 #10714