Shift modal closes 1142

also need to implement this one