Shift modal closes #1142