Fix twice request when switching layout on composer