diff --git a/.vscode/launch.json b/.vscode/launch.json
index de669145..60f9e770 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -13,9 +13,7 @@
             "stopOnEntry": false,
             "sourceMaps": true,
             "outFiles": [
-                "${workspaceFolder}/out/*",
-                "${workspaceFolder}/out/src/*",
-                "${workspaceFolder}/out/test/*"
+                "${workspaceFolder}/dist/**/*.js"
             ],
             "env": {
                 "CMT_DEVRUN": "1"
diff --git a/src/cmake-tools.ts b/src/cmake-tools.ts
index 7c67c95e..a6d8689c 100644
--- a/src/cmake-tools.ts
+++ b/src/cmake-tools.ts
@@ -375,6 +375,9 @@ export class CMakeTools implements vscode.Disposable, api.CMakeToolsAPI {
           this._cmakeDriver = Promise.resolve(null);
           this._activeKit = null;
         }
+      } else {
+        // Remember the selected kit for the next session.
+        this.workspaceContext.state.activeKitName = kit.name;
       }
     }
   }