Added workaround for issue where data points would be captured through other dialogs.