Add return to the current channel (issue #4112)