Indenting of multi-line expressions (e.g. 'if (xx\nxx) {}'

First of all: The new indenter works almost perfect for me, good stuff! One thing I really appreciated is the indenting of multi-line if statement expressions. E.g.

if (bla 
        || bla) {
}

However, there is a case where this doesn't work automatically. Say I have

if (bla) {
}

And want to extend the condition. Then I place the cursor before the closing bracket, type Return, and the new condition. I end up with

if (bla
|| bla) {
}

Is there a way to fix also this case? E.g. by always indenting the following lines?