Editor inserts line break with smiley

[XFFA.IR Bot]

Steps to reproduce:

1. Type some text in editor
2. Begin typing text shortcut for smiley, e.g. :oo
3. Wait for drop down menu to appear
4. Select smiley from the list

Editor inserts both smiley and line break before it. Line break should not be inserted.

This issue was not present in v2.3.6.

See example below: