UI-2761: Incorrect UI of Comment Behavior