Closes #3164109 @gcb You were too fast! Discovered a bug if you went to the Organization page or a view tab built off of the organization page (it whitescreened). This fixes that.