Possible fix for #757
Merge pull request #758 from Amrykid/combobox-whatever

Fix #757