diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html b/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
index b26bb45af..6a8676ebc 100644
--- a/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
+++ b/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.html
@@ -15,11 +15,16 @@
   <ion-grid>
     <ion-row style="padding-left: 12px">
       <ion-col>
+        <ion-button
+          *ngIf="canStop"
+          class="action-button"
+          color="danger"
+          (click)="tryStop()"
+        >
+          <ion-icon slot="start" name="stop-outline"></ion-icon>
+          Stop
+        </ion-button>
         <ng-container *ngIf="isRunning">
-          <ion-button class="action-button" color="danger" (click)="tryStop()">
-            <ion-icon slot="start" name="stop-outline"></ion-icon>
-            Stop
-          </ion-button>
           <ion-button
             class="action-button"
             color="tertiary"
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts b/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
index 61e5e9d92..f67a2b2fa 100644
--- a/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
+++ b/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-status/app-show-status.component.ts
@@ -61,6 +61,14 @@ export class AppShowStatusComponent {
     return this.status.primary === PrimaryStatus.Running
   }
 
+  get canStop(): boolean {
+    return [
+      PrimaryStatus.Running,
+      PrimaryStatus.Starting,
+      PrimaryStatus.Restarting,
+    ].includes(this.status.primary)
+  }
+
   get isStopped(): boolean {
     return this.status.primary === PrimaryStatus.Stopped
   }