Fixes #1359 - Editor issue with lists

Fixes #1359