Comment 13 for bug 722375

Hey folks, I came up with this patch which seems to resolve the issue here, and breaks the infinite loop caused by appmenu.patch.
Can you verify that it's not causing anything else, talk a little to upstream to see if they agree etc?