Fix editing of properties, once again

the better solution would be to properly split the entityview
into a propertyview and itemview, but that is too much for
something we want to backport.

Change-Id: I10b6024094d6a72ea5e7c3a3f94882c77df1aec0