"Download Clip" dialog has focus on wrong button

"Download Clip" dialog opens to show apparent focus on "Download" button. There are 2 problems with this:
- Pressing the Enter key effects the Cancel function instead of the Download function;
- The only way to see the correct focus is by task-switching to a different window and then return to the 4K Download window.