[merge addon] Fix another layout issue