Fix app not responding

#1677 had zero commits. It had commits at the time of submission so it must of been overridden. This PR contains the missing code.