Clean up reloading and pressing enter on edit fields.
Merge pull request #1019 from NatTuck/cleanup-fields-edit

Clean up reloading and pressing enter on edit fields.