Status is reset only if not in Edit mode

Change-Id: Ic982e9ad7af585baa97f5709268f6291b076a893