Prevent duplicate keys in controls
Partial fix for 694244