[BIServer 8408] Rework code after failed merge. Found bug in workspace

menu item did not set perspective and would not toggle.