Updated to try to catch some of the EDT threading issues.
Refs #2965

Change-Id: I81112c6d13ae0a73efa8dd0f208c93702b090258