diff --git a/resources/developer-mode.mjs b/resources/developer-mode.mjs
index e93e05008..9f7a01d58 100644
--- a/resources/developer-mode.mjs
+++ b/resources/developer-mode.mjs
@@ -223,12 +223,12 @@ function createUIForSuites() {
 
 function createUIForRun() {
     const stepTestButton = document.createElement("button");
-    stepTestButton.textContent = "Step Test ⏯";
+    stepTestButton.textContent = "Step Test \u23EF";
     stepTestButton.onclick = (event) => {
         globalThis.benchmarkClient.step();
     };
     const startTestButton = document.createElement("button");
-    startTestButton.textContent = "Start Test ⏵";
+    startTestButton.textContent = "Start Test \u23F5";
     startTestButton.onclick = (event) => {
         globalThis.benchmarkClient.start();
     };
diff --git a/resources/main.mjs b/resources/main.mjs
index 4b25ba058..76b756449 100644
--- a/resources/main.mjs
+++ b/resources/main.mjs
@@ -46,9 +46,10 @@ class MainBenchmarkClient {
     }
 
     _clearStepping() {
-        this._steppingResolver();
+        const currentSteppingResolver = this._steppingResolver;
         this._steppingPromise = null;
         this._steppingResolver = null;
+        currentSteppingResolver();
     }
 
     async _awaitNextStep(suite, test) {