Scrolling issue after save fixed