fix side effect introduce with list/expand buttons
Merge pull request #507 from jaugustin/fix-side-effect-list-expand-btn

fix side effect introduce with list/expand buttons