Issue 6936: 'Add watch' on properties in the watch panel adds the wrong expression