diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4aa29c2..e606379 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 > **Note**: odd version numbers, for example, `0.13.0`, are not included in this changelog. They are used to test the new features and fixes before the final release.
 
+## [0.19.0] - Unreleased
+
+### Changed:
+
+- Commands: Refactored stop command logic
+
 ## [0.18.3] - 2025-03-03
 
 ### Added:
diff --git a/package-lock.json b/package-lock.json
index 166d0cf..de15438 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "dev-proxy-toolkit",
-  "version": "0.18.3",
+  "version": "0.19.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "dev-proxy-toolkit",
-      "version": "0.18.3",
+      "version": "0.19.0",
       "dependencies": {
         "json-to-ast": "^2.1.0"
       },
diff --git a/package.json b/package.json
index 1ccb8e8..7cf12bb 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "dev-proxy-toolkit",
   "displayName": "Dev Proxy Toolkit",
   "description": "Makes it easy to create and update Dev Proxy configuration files.",
-  "version": "0.18.3",
+  "version": "0.19.0",
   "publisher": "garrytrinder",
   "engines": {
     "vscode": "^1.89.0"
diff --git a/src/commands.ts b/src/commands.ts
index c8aa254..b960754 100644
--- a/src/commands.ts
+++ b/src/commands.ts
@@ -122,13 +122,17 @@ export const registerCommands = (context: vscode.ExtensionContext, configuration
                     }
                 };
 
-                let isRunning = true;
-                while (isRunning) {
-                    isRunning = await checkProxyStatus();
-                    if (isRunning) {
-                        await new Promise(resolve => setTimeout(resolve, 1000));
+                const waitForProxyToStop = async () => {
+                    let isRunning = true;
+                    while (isRunning) {
+                        isRunning = await checkProxyStatus();
+                        if (isRunning) {
+                            await new Promise(resolve => setTimeout(resolve, 1000));
+                        }
                     }
-                }
+                };
+
+                await waitForProxyToStop();
 
                 vscode.window.terminals.forEach(terminal => {
                     if (terminal.name === 'Dev Proxy') {