[comment addon] Fix two border cases

Issue #2768