Fix Q shortcut issue #1823

fixes #1823