Added proper autofocus on editing