App: be a little more thorough when activating a surface