Clock remains active when changing screen

See solution provided in