Weird bug: pressing enter on comp and layer names deletes the layer name?

New 2016 15" macbook pro. CC 2015. When I press enter on a comp or layer name instead of just highlighting and letting me edit it deletes the text that was there. Anyone know how to fix this?