EditableListView doesn't remove the correct item if empty ComboBox is shown

If there is a bunch of items in the EditableListView and a new empty one will be added (pressing plus button), clicking on any of the already existing crosses to remove items it will always remove the empty item at the bottom.

Steps to reproduce:

1. Go to ModelSection, Materials EditableListView
2. Add a bunch of materials
3. Add another one keep it empty
4. Click on remove cross of one of the non empty ones
5. The empty one is removed