Fix #1546 "Default value overrides existing when switching to view mode"