Issue 6857: Make the watch editor display the current value