FIX: Dropdowns not responding to conditional logic

Ensures the correct actions are listened for.
Merge commit '319d1972b15b78397445385a40a4094078d1a3af' into HEAD