Actual bug fix for Home button

The previous fix didn't work. (Couldn't test it till it went to
production).