Further scanner dialogs blocking improvements