Changing orgs leaves query building in invalid state

[paustint]

Similar to #233 and maybe the same fix applies to both?

Describe the bug and steps to reproduce
Steps to repro

1. Build a query
2. Execute
3. Change Orgs ( quickly )
4. Click Back

Loading Icon Stuck