Resolves: fdo#83003 provide a means to return from template view

Change-Id: Ie6d2cfb5ee28fbd9395a49fa074a252c9c6e20ec