diff --git a/public/js/commandline.js b/public/js/commandline.js
index 537fea4fc..0469e9a3d 100644
--- a/public/js/commandline.js
+++ b/public/js/commandline.js
@@ -303,20 +303,30 @@ let commands = {
     {
       id: "bailOut",
       display: "Bail out...",
+      subgroup: true,
+      visible: false,
       exec: () => {
-        currentCommands = {
+        currentCommands.push({
           title: "Are you sure...",
           list: [
+            {
+              id: "bailOutNo",
+              display: "Nevermind",
+              exec: () => {
+                hideCommandLine();
+              },
+            },
             {
               id: "bailOutForSure",
-              display: "Yes, im sure",
+              display: "Yes, I am sure",
               exec: () => {
                 bailout = true;
                 showResult();
               },
             },
           ],
-        };
+        });
+        showCommandLine();
       },
     },
     {
@@ -1169,7 +1179,7 @@ function updateSuggestedCommands() {
         }
       });
       if (foundcount > 0) {
-        if (obj.visible !== false) obj.found = true;
+        obj.found = true;
       } else {
         obj.found = false;
       }
diff --git a/public/js/script.js b/public/js/script.js
index 1a2a01f19..efa75bbb5 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -1497,6 +1497,8 @@ function showResult(difficultyFailed = false) {
 
   let afkDetected = kps === 0 ? true : false;
 
+  if (bailout) afkDetected = false;
+
   if (difficultyFailed) {
     showNotification("Test failed", 2000);
   } else if (afkDetected) {
@@ -1537,6 +1539,7 @@ function showResult(difficultyFailed = false) {
       consistency: consistency,
       keyConsistency: keyConsistency,
       funbox: activeFunBox,
+      bailedOut: bailout,
     };
     if (
       config.difficulty == "normal" ||