Shift+Return should always do a new line.

With the new option to use Return to create or not create notes on the preference section, Shift+Return has the same function as Return. Ctrl+Return has the opposite function as Return.

Whereas Shift+Return should always do a new line.

This will make it work like other applications.