diff --git a/src/extension.ts b/src/extension.ts
index cb9b31b..4f8e850 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -5,6 +5,7 @@ export function activate(context: vscode.ExtensionContext): void {
   const provider = new ChatViewProvider(context);
 
   context.subscriptions.push(
+    provider,
     vscode.window.registerWebviewViewProvider("pycodeloop.chat", provider, {
       webviewOptions: { retainContextWhenHidden: true },
     }),
diff --git a/src/vscode/sidebar/chatSidebarProvider.ts b/src/vscode/sidebar/chatSidebarProvider.ts
index 598f456..a1c6f4d 100644
--- a/src/vscode/sidebar/chatSidebarProvider.ts
+++ b/src/vscode/sidebar/chatSidebarProvider.ts
@@ -55,6 +55,10 @@ export class ChatViewProvider implements vscode.WebviewViewProvider {
     this.chat.startConnection();
   }
 
+  dispose(): void {
+    this.chat.dispose();
+  }
+
   newSession(): void {
     this.sessions.newSession();
   }