[Bug 828905] Fix home button while selectig more shortcuts [r=crdlc]
Merge pull request #7485 from EverythingMe/bugfix-home-while-more-shortcuts

[Bug 828905] Fix home button while selectig more shortcuts [r=crdlc]
Auto-merge from branch 'master'