Binding return key to "complete current statement"

For years I have had the return key bound to "complete current statement" in my keymap. I love being able to press return and have closing parens and a semicolon inserted for me.

But this means that pressing return doesn't "click" the default button in a popup window. For example, when in the evaluate expression popup, pressing return now inserts a line break rather than evaluating the expression. This is obviously a nuisance.

It definitely used to work, but I can't remember which release it changed in. A while ago.

Can anyone tell me how I can have both these things work?