Ensure workspace is visible when showing workspace

Change-Id: I07b2f13b5f86076e66824c1670f877df52f3bdd6