If one types, say:
If foo = bar Then
Else
... shift-enter should also produce an End If here, not just after a Then.
Arguably it should also do this after any line beginning with ElseIf. While it's true that there might be a subsequent Else or ElseIf, shift-enter is a pretty deliberate user act, so they can go back and insert those later if needed.
Same principle for Select Case: End Case after an Else at minimum, and I would say also after a Case.