Fix issue with ivalid current shortcut redirection

Please review
@tavriaforever @gela-d