Fixes #316 - Check all buttons until an active one is found
Merge pull request #323 from l0rdn1kk0n/issue-316

Fixes #316 - Check all buttons until an active one is found