diff --git a/package.json b/package.json
index 4b72504a..b3528d96 100644
--- a/package.json
+++ b/package.json
@@ -94,6 +94,11 @@
         "title": "Coder: Open Workspace",
         "icon": "$(play)"
       },
+      {
+        "command": "coder.openFromSidebar",
+        "title": "Coder: Open Workspace",
+        "icon": "$(play)"
+      },
       {
         "command": "coder.createWorkspace",
         "title": "Create Workspace",
@@ -147,18 +152,18 @@
       ],
       "view/item/context": [
         {
-          "command": "coder.open",
-          "when": "coder.authenticated && view == myWorkspaces || coder.authenticated && view == allWorkspaces",
+          "command": "coder.openFromSidebar",
+          "when": "coder.authenticated && viewItem == coderWorkspaceSingleAgent || coder.authenticated && viewItem == coderAgent",
           "group": "inline"
         },
         {
           "command": "coder.navigateToWorkspace",
-          "when": "coder.authenticated && view == myWorkspaces || coder.authenticated && view == allWorkspaces",
+          "when": "coder.authenticated && viewItem == coderWorkspaceSingleAgent || coder.authenticated && viewItem == coderWorkspaceMultipleAgents",
           "group": "inline"
         },
         {
           "command": "coder.navigateToWorkspaceSettings",
-          "when": "coder.authenticated && view == myWorkspaces || coder.authenticated && view == allWorkspaces",
+          "when": "coder.authenticated && viewItem == coderWorkspaceSingleAgent || coder.authenticated && viewItem == coderWorkspaceMultipleAgents",
           "group": "inline"
         }
       ]
@@ -223,4 +228,4 @@
     "ws": "^8.11.0",
     "yaml": "^1.10.0"
   }
-}
\ No newline at end of file
+}
diff --git a/src/api-helper.ts b/src/api-helper.ts
index 75c0af83..ea36a3b3 100644
--- a/src/api-helper.ts
+++ b/src/api-helper.ts
@@ -1,16 +1,9 @@
 import { Workspace, WorkspaceAgent } from "coder/site/src/api/typesGenerated"
 
-export function extractAgentsAndFolderPath(
-  workspace: Workspace,
-): [agents: WorkspaceAgent[], folderPath: string | undefined] {
-  // TODO: multiple agent support
+export function extractAgents(workspace: Workspace): WorkspaceAgent[] {
   const agents = workspace.latest_build.resources.reduce((acc, resource) => {
     return acc.concat(resource.agents || [])
   }, [] as WorkspaceAgent[])
 
-  let folderPath = undefined
-  if (agents.length === 1) {
-    folderPath = agents[0].expanded_directory
-  }
-  return [agents, folderPath]
+  return agents
 }
diff --git a/src/commands.ts b/src/commands.ts
index bd4fc1b5..9995e8bf 100644
--- a/src/commands.ts
+++ b/src/commands.ts
@@ -1,8 +1,8 @@
 import axios from "axios"
 import { getAuthenticatedUser, getWorkspaces, updateWorkspaceVersion } from "coder/site/src/api/api"
-import { Workspace } from "coder/site/src/api/typesGenerated"
+import { Workspace, WorkspaceAgent } from "coder/site/src/api/typesGenerated"
 import * as vscode from "vscode"
-import { extractAgentsAndFolderPath } from "./api-helper"
+import { extractAgents } from "./api-helper"
 import { Remote } from "./remote"
 import { Storage } from "./storage"
 import { WorkspaceTreeItem } from "./workspacesProvider"
@@ -143,9 +143,21 @@ export class Commands {
     }
   }
 
+  public async openFromSidebar(treeItem: WorkspaceTreeItem) {
+    if (treeItem) {
+      await openWorkspace(
+        treeItem.workspaceOwner,
+        treeItem.workspaceName,
+        treeItem.workspaceAgent,
+        treeItem.workspaceFolderPath,
+      )
+    }
+  }
+
   public async open(...args: unknown[]): Promise<void> {
     let workspaceOwner: string
     let workspaceName: string
+    let workspaceAgent: string | undefined
     let folderPath: string | undefined
 
     if (args.length === 0) {
@@ -200,83 +212,61 @@ export class Commands {
       workspaceOwner = workspace.owner_name
       workspaceName = workspace.name
 
-      const [, folderPathExtracted] = extractAgentsAndFolderPath(workspace)
-      folderPath = folderPathExtracted
-    } else if (args.length === 2) {
-      // opening a workspace from the sidebar
-      const workspaceTreeItem = args[0] as WorkspaceTreeItem
-      workspaceOwner = workspaceTreeItem.workspaceOwner
-      workspaceName = workspaceTreeItem.workspaceName
-      folderPath = workspaceTreeItem.workspaceFolderPath
-    } else {
-      workspaceOwner = args[0] as string
-      workspaceName = args[1] as string
-      // workspaceAgent is reserved for args[2], but multiple agents aren't supported yet.
-      folderPath = args[3] as string | undefined
-    }
-
-    // A workspace can have multiple agents, but that's handled
-    // when opening a workspace unless explicitly specified.
-    const remoteAuthority = `ssh-remote+${Remote.Prefix}${workspaceOwner}--${workspaceName}`
+      const agents = extractAgents(workspace)
 
-    let newWindow = true
-    // Open in the existing window if no workspaces are open.
-    if (!vscode.workspace.workspaceFolders?.length) {
-      newWindow = false
-    }
+      if (agents.length === 1) {
+        folderPath = agents[0].expanded_directory
+        workspaceAgent = agents[0].name
+      } else {
+        const agentQuickPick = vscode.window.createQuickPick()
+        agentQuickPick.title = `Select an agent`
 
-    // If a folder isn't specified, we can try to open a recently opened folder.
-    if (!folderPath) {
-      const output: {
-        workspaces: { folderUri: vscode.Uri; remoteAuthority: string }[]
-      } = await vscode.commands.executeCommand("_workbench.getRecentlyOpened")
-      const opened = output.workspaces.filter(
-        // Filter out `/` since that's added below.
-        (opened) => opened.folderUri?.authority === remoteAuthority,
-      )
-      if (opened.length > 0) {
-        let selected: (typeof opened)[0]
+        agentQuickPick.busy = true
+        const lastAgents = agents
+        const agentItems: vscode.QuickPickItem[] = agents.map((agent) => {
+          let icon = "$(debug-start)"
+          if (agent.status !== "connected") {
+            icon = "$(debug-stop)"
+          }
+          return {
+            alwaysShow: true,
+            label: `${icon} ${agent.name}`,
+            detail: `${agent.name} • Status: ${agent.status}`,
+          }
+        })
+        agentQuickPick.items = agentItems
+        agentQuickPick.busy = false
+        agentQuickPick.show()
 
-        if (opened.length > 1) {
-          const items: vscode.QuickPickItem[] = opened.map((folder): vscode.QuickPickItem => {
-            return {
-              label: folder.folderUri.path,
-            }
+        const agent = await new Promise<WorkspaceAgent | undefined>((resolve) => {
+          agentQuickPick.onDidHide(() => {
+            resolve(undefined)
           })
-          const item = await vscode.window.showQuickPick(items, {
-            title: "Select a recently opened folder",
+          agentQuickPick.onDidChangeSelection((selected) => {
+            if (selected.length < 1) {
+              return resolve(undefined)
+            }
+            const agent = lastAgents[agentQuickPick.items.indexOf(selected[0])]
+            resolve(agent)
           })
-          if (!item) {
-            return
-          }
-          selected = opened[items.indexOf(item)]
+        })
+
+        if (agent) {
+          folderPath = agent.expanded_directory
+          workspaceAgent = agent.name
         } else {
-          selected = opened[0]
+          folderPath = ""
+          workspaceAgent = ""
         }
-
-        folderPath = selected.folderUri.path
       }
+    } else {
+      workspaceOwner = args[0] as string
+      workspaceName = args[1] as string
+      // workspaceAgent is reserved for args[2], but multiple agents aren't supported yet.
+      folderPath = args[3] as string | undefined
     }
 
-    if (folderPath) {
-      await vscode.commands.executeCommand(
-        "vscode.openFolder",
-        vscode.Uri.from({
-          scheme: "vscode-remote",
-          authority: remoteAuthority,
-          path: folderPath,
-        }),
-        // Open this in a new window!
-        newWindow,
-      )
-      return
-    }
-
-    // This opens the workspace without an active folder opened.
-    await vscode.commands.executeCommand("vscode.newWindow", {
-      remoteAuthority: remoteAuthority,
-      reuseWindow: !newWindow,
-    })
+    await openWorkspace(workspaceOwner, workspaceName, workspaceAgent, folderPath)
   }
 
   public async updateWorkspace(): Promise<void> {
@@ -297,3 +287,76 @@ export class Commands {
     }
   }
 }
+
+async function openWorkspace(
+  workspaceOwner: string,
+  workspaceName: string,
+  workspaceAgent: string | undefined,
+  folderPath: string | undefined,
+) {
+  // A workspace can have multiple agents, but that's handled
+  // when opening a workspace unless explicitly specified.
+  let remoteAuthority = `ssh-remote+${Remote.Prefix}${workspaceOwner}--${workspaceName}`
+  if (workspaceAgent) {
+    remoteAuthority += `--${workspaceAgent}`
+  }
+
+  let newWindow = true
+  // Open in the existing window if no workspaces are open.
+  if (!vscode.workspace.workspaceFolders?.length) {
+    newWindow = false
+  }
+
+  // If a folder isn't specified, we can try to open a recently opened folder.
+  if (!folderPath) {
+    const output: {
+      workspaces: { folderUri: vscode.Uri; remoteAuthority: string }[]
+    } = await vscode.commands.executeCommand("_workbench.getRecentlyOpened")
+    const opened = output.workspaces.filter(
+      // Filter out `/` since that's added below.
+      (opened) => opened.folderUri?.authority === remoteAuthority,
+    )
+    if (opened.length > 0) {
+      let selected: (typeof opened)[0]
+
+      if (opened.length > 1) {
+        const items: vscode.QuickPickItem[] = opened.map((folder): vscode.QuickPickItem => {
+          return {
+            label: folder.folderUri.path,
+          }
+        })
+        const item = await vscode.window.showQuickPick(items, {
+          title: "Select a recently opened folder",
+        })
+        if (!item) {
+          return
+        }
+        selected = opened[items.indexOf(item)]
+      } else {
+        selected = opened[0]
+      }
+
+      folderPath = selected.folderUri.path
+    }
+  }
+
+  if (folderPath) {
+    await vscode.commands.executeCommand(
+      "vscode.openFolder",
+      vscode.Uri.from({
+        scheme: "vscode-remote",
+        authority: remoteAuthority,
+        path: folderPath,
+      }),
+      // Open this in a new window!
+      newWindow,
+    )
+    return
+  }
+
+  // This opens the workspace without an active folder opened.
+  await vscode.commands.executeCommand("vscode.newWindow", {
+    remoteAuthority: remoteAuthority,
+    reuseWindow: !newWindow,
+  })
+}
diff --git a/src/extension.ts b/src/extension.ts
index 7131dd95..b5f02c9a 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -87,6 +87,7 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
   vscode.commands.registerCommand("coder.login", commands.login.bind(commands))
   vscode.commands.registerCommand("coder.logout", commands.logout.bind(commands))
   vscode.commands.registerCommand("coder.open", commands.open.bind(commands))
+  vscode.commands.registerCommand("coder.openFromSidebar", commands.openFromSidebar.bind(commands))
   vscode.commands.registerCommand("coder.workspace.update", commands.updateWorkspace.bind(commands))
   vscode.commands.registerCommand("coder.createWorkspace", commands.createWorkspace.bind(commands))
   vscode.commands.registerCommand("coder.navigateToWorkspace", commands.navigateToWorkspace.bind(commands))
diff --git a/src/workspacesProvider.ts b/src/workspacesProvider.ts
index f09b29e4..5cdee575 100644
--- a/src/workspacesProvider.ts
+++ b/src/workspacesProvider.ts
@@ -1,7 +1,8 @@
 import { getWorkspaces } from "coder/site/src/api/api"
+import { WorkspaceAgent } from "coder/site/src/api/typesGenerated"
 import * as path from "path"
 import * as vscode from "vscode"
-import { extractAgentsAndFolderPath } from "./api-helper"
+import { extractAgents } from "./api-helper"
 
 export enum WorkspaceQuery {
   Mine = "owner:me",
@@ -24,7 +25,19 @@ export class WorkspaceProvider implements vscode.TreeDataProvider<WorkspaceTreeI
     return element
   }
 
-  getChildren(): Thenable<WorkspaceTreeItem[]> {
+  getChildren(element?: WorkspaceTreeItem): Thenable<WorkspaceTreeItem[]> {
+    if (element) {
+      if (element.agents.length > 0) {
+        return Promise.resolve(
+          element.agents.map((agent) => {
+            const label = agent.name
+            const detail = `Status: ${agent.status}`
+            return new WorkspaceTreeItem(label, detail, "", "", agent.name, agent.expanded_directory, [], "coderAgent")
+          }),
+        )
+      }
+      return Promise.resolve([])
+    }
     return getWorkspaces({ q: this.getWorkspacesQuery }).then((workspaces) => {
       return workspaces.workspaces.map((workspace) => {
         const status =
@@ -35,22 +48,42 @@ export class WorkspaceProvider implements vscode.TreeDataProvider<WorkspaceTreeI
             ? `${workspace.owner_name} / ${workspace.name}`
             : workspace.name
         const detail = `Template: ${workspace.template_display_name || workspace.template_name} • Status: ${status}`
-        const [, folderPath] = extractAgentsAndFolderPath(workspace)
-        return new WorkspaceTreeItem(label, detail, workspace.owner_name, workspace.name, folderPath)
+        const agents = extractAgents(workspace)
+        return new WorkspaceTreeItem(
+          label,
+          detail,
+          workspace.owner_name,
+          workspace.name,
+          undefined,
+          agents[0]?.expanded_directory,
+          agents,
+          agents.length > 1 ? "coderWorkspaceMultipleAgents" : "coderWorkspaceSingleAgent",
+        )
       })
     })
   }
 }
 
+type CoderTreeItemType = "coderWorkspaceSingleAgent" | "coderWorkspaceMultipleAgents" | "coderAgent"
+
 export class WorkspaceTreeItem extends vscode.TreeItem {
   constructor(
     public readonly label: string,
     public readonly tooltip: string,
     public readonly workspaceOwner: string,
     public readonly workspaceName: string,
+    public readonly workspaceAgent: string | undefined,
     public readonly workspaceFolderPath: string | undefined,
+    public readonly agents: WorkspaceAgent[],
+    contextValue: CoderTreeItemType,
   ) {
-    super(label, vscode.TreeItemCollapsibleState.None)
+    super(
+      label,
+      contextValue === "coderWorkspaceMultipleAgents"
+        ? vscode.TreeItemCollapsibleState.Collapsed
+        : vscode.TreeItemCollapsibleState.None,
+    )
+    this.contextValue = contextValue
   }
 
   iconPath = {

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/coder/vscode-coder/pull/59.diff" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/coder/vscode-coder/pull/59.diff" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/coder/vscode-coder/pull/59.diff" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/coder/vscode-coder/pull/59.diff" target="_blank">pFad v4 Proxy</a></p></body>
</html>