Bug 890961 make app work as app

r? @ednapiranha :coffee: