Unexpected behavior when inserting new line in the middle of SQL statment

After updating Pycharm/Datagrip to 2020.1 when pressing return in the middle of a Postgres query string weird things happen.

I've tried disabling the formatting for Postgres, that doesn't fix it. Disabling the DataGrip plugin altogether does stop it, so I know it's related to DataGrip.

I've tried all the combinations of the SmartKey settings relating to SQL.

Any help would be appreciated, this is driving me nuts.