diff --git a/Questionable/Windows/QuestComponents/ActiveQuestComponent.cs b/Questionable/Windows/QuestComponents/ActiveQuestComponent.cs
index 25b9d38c9..2a66f1b92 100644
--- a/Questionable/Windows/QuestComponents/ActiveQuestComponent.cs
+++ b/Questionable/Windows/QuestComponents/ActiveQuestComponent.cs
@@ -79,7 +79,7 @@ internal sealed class ActiveQuestComponent
             ImGui.Text(_questController.ToStatString());
             //ImGui.EndDisabled();
 
-            DrawQuestIcons(currentQuest, currentStep, questWork);
+            DrawQuestButtons(currentQuest, currentStep, questWork);
 
             DrawSimulationControls();
         }
@@ -87,6 +87,12 @@ internal sealed class ActiveQuestComponent
         {
             ImGui.Text("No active quest");
             ImGui.TextColored(ImGuiColors.DalamudGrey, $"{_questRegistry.Count} quests loaded");
+
+            if (ImGuiComponents.IconButton(FontAwesomeIcon.Stop))
+            {
+                _movementController.Stop();
+                _questController.Stop("Manual (no active quest)");
+            }
         }
     }
 
@@ -199,7 +205,7 @@ internal sealed class ActiveQuestComponent
         return questWork;
     }
 
-    private void DrawQuestIcons(QuestController.QuestProgress currentQuest, QuestStep? currentStep,
+    private void DrawQuestButtons(QuestController.QuestProgress currentQuest, QuestStep? currentStep,
         QuestWork? questWork)
     {
         ImGui.BeginDisabled(_questController.IsRunning);
diff --git a/Questionable/Windows/QuestComponents/QuickAccessButtonsComponent.cs b/Questionable/Windows/QuestComponents/QuickAccessButtonsComponent.cs
index 26e665b5f..5a528a1e6 100644
--- a/Questionable/Windows/QuestComponents/QuickAccessButtonsComponent.cs
+++ b/Questionable/Windows/QuestComponents/QuickAccessButtonsComponent.cs
@@ -64,17 +64,6 @@ internal sealed class QuickAccessButtonsComponent
             }
         }
 
-        ImGui.SameLine();
-
-        using (var unused = ImRaii.Disabled(!_movementController.IsPathRunning))
-        {
-            if (ImGuiComponents.IconButtonWithText(FontAwesomeIcon.StopCircle, "Stop"))
-            {
-                _movementController.Stop();
-                _questController.Stop("Manual");
-            }
-        }
-
         if (_commandManager.Commands.ContainsKey("/vnav"))
         {
             ImGui.SameLine();