prevent that early return prevents further user interaction

Change-Id: I24f814a402d2b8af3ddf888719b78d3158c2a38f