Renaming Layers does not stick

The frustration that comes with renaming a layer has me not using the "OK" button upon renaming, but using "the return/enter key" instead. At least 50% of the time that works where using the OK button doesn't work more times than it works. This is such a hassle that sometimes I don't even change the name of the layers. Now that's dysfunctional. 

Please fix this.