Fix sidebar flow