PLA-719 fix for margin while toggling