diff --git a/package.json b/package.json
index c4507d7..3c3c80b 100644
--- a/package.json
+++ b/package.json
@@ -15,18 +15,18 @@
     "theme": "dark"
   },
   "keywords": [
-    "codemp",
-    "collaborative",
-    "editing",
-    "multiplatform",
-    "live",
-    "development"
+  	"codemp",
+  	"collaborative",
+  	"editing",
+  	"multiplatform",
+  	"live",
+  	"development"
   ],
   "categories": [
-    "SCM Providers",
-    "Visualization",
-    "Programming Languages",
-    "Other"
+  "SCM Providers",
+  "Visualization",
+  "Programming Languages",
+  "Other"
   ],
   "activationEvents": [
     "onCommand:extension.openMyExtension"
@@ -34,13 +34,13 @@
   "main": "./out/extension.js",
   "contributes": {
     "viewsContainers": {
-      "activitybar": [
-        {
-          "id": "codemp-tree-container",
-          "title": "codemp",
-          "icon": "resources/logo.svg"
-        }
-      ]
+    "activitybar": [
+      {
+        "id": "codemp-tree-container",
+        "title": "codemp",
+        "icon": "resources/logo.svg"
+      }
+    ]
     },
     "viewsWelcome": [
       {
@@ -74,7 +74,7 @@
       "view/item/context": [
         {
           "command": "codemp.join",
-          "when": "view == codemp-tree-view && viewItem == workspace",
+          "when": "view == codemp-tree-view && viewItem == workspace_active",
           "group": "inline"
         },
         {
@@ -228,4 +228,4 @@
   "dependencies": {
     "codemp": "^0.0.10"
   }
-}
+}
\ No newline at end of file
diff --git a/src/tree.ts b/src/tree.ts
index 76bbd20..5711d9d 100644
--- a/src/tree.ts
+++ b/src/tree.ts
@@ -62,7 +62,7 @@ export class CodempTreeProvider implements vscode.TreeDataProvider<CodempTreeIte
 				return out;
 			}
 			let items = workspace_list.map((x) =>
-				new CodempTreeItem(x, Type.Workspace, true, workspace !== null && workspace.id() == x)
+				new CodempTreeItem(x, Type.Workspace, true, workspace === null)
 			);
 			items.push(new CodempTreeItem("", Type.Placeholder, false));
 			items.push(new CodempTreeItem("<Users>", Type.UserList, true));