Fix after save focus error