Fix/Hack for handleBeforeShow

Why doesn't this work with only the return?