diff --git a/src/renderer/components/+workspaces/add-workspace.tsx b/src/renderer/components/+workspaces/add-workspace.tsx
index 3d2724476e..d0ddcf2d65 100644
--- a/src/renderer/components/+workspaces/add-workspace.tsx
+++ b/src/renderer/components/+workspaces/add-workspace.tsx
@@ -10,7 +10,7 @@ import { CommandOverlay } from "../command-palette/command-container";
 const uniqueWorkspaceName: InputValidator = {
   condition: ({ required }) => required,
   message: () => `Workspace with this name already exists`,
-  validate: value => !workspaceStore.enabledWorkspacesList.find((workspace) => workspace.name === value),
+  validate: value => !workspaceStore.workspacesList.find((workspace) => workspace.name === value),
 };
 
 @observer
diff --git a/src/renderer/components/+workspaces/remove-workspace.tsx b/src/renderer/components/+workspaces/remove-workspace.tsx
index e2ca951efe..9f66292447 100644
--- a/src/renderer/components/+workspaces/remove-workspace.tsx
+++ b/src/renderer/components/+workspaces/remove-workspace.tsx
@@ -31,10 +31,6 @@ export class RemoveWorkspace extends React.Component {
       },
       ok: () => {
         workspaceStore.removeWorkspace(workspace);
-
-        if (workspace.id === workspaceStore.currentWorkspaceId) {
-          workspaceStore.setActive(workspaceStore.enabledWorkspacesList[0].id);
-        }
       },
       message: (
         <div className="confirm flex column gaps">
diff --git a/src/renderer/components/command-palette/command-container.tsx b/src/renderer/components/command-palette/command-container.tsx
index 9c34ef8c93..74e46a89f0 100644
--- a/src/renderer/components/command-palette/command-container.tsx
+++ b/src/renderer/components/command-palette/command-container.tsx
@@ -30,7 +30,6 @@ export class CommandOverlay {
 
 @observer
 export class CommandContainer extends React.Component<{cluster?: Cluster}> {
-  @observable visible = false;
   @observable commandComponent: React.ReactElement;
 
   private escHandler(event: KeyboardEvent) {
diff --git a/src/renderer/components/command-palette/command-dialog.tsx b/src/renderer/components/command-palette/command-dialog.tsx
index 4f27784a3b..ba6b7c2f15 100644
--- a/src/renderer/components/command-palette/command-dialog.tsx
+++ b/src/renderer/components/command-palette/command-dialog.tsx
@@ -61,7 +61,7 @@ export class CommandDialog extends React.Component {
         broadcastMessage(`command-palette:run-action:${clusterStore.active.id}`, command.id);
       }
     } catch(error) {
-      console.error("failed to execute command", command.id, error);
+      console.error("[COMMAND-DIALOG] failed to execute command", command.id, error);
     }
   }