untested fix to the dropdown controller and modal