diff --git a/src/components/panels/Status/Jobqueue.vue b/src/components/panels/Status/Jobqueue.vue
index 814f5287..c9b87525 100644
--- a/src/components/panels/Status/Jobqueue.vue
+++ b/src/components/panels/Status/Jobqueue.vue
@@ -57,7 +57,7 @@
                         </template>
                     </td>
                     <td class="pr-2">
-                        <template v-if="item.isFirst">
+                        <template v-if="item.isFirst && !printerIsPrinting">
                             <v-btn icon color="success" class="float-right minwidth-0 mt-1" @click="startJobqueue">
                                 <v-icon>{{ mdiPlay }}</v-icon>
                             </v-btn>
diff --git a/src/components/panels/StatusPanel.vue b/src/components/panels/StatusPanel.vue
index c3783792..a04888d8 100644
--- a/src/components/panels/StatusPanel.vue
+++ b/src/components/panels/StatusPanel.vue
@@ -122,13 +122,13 @@ export default class StatusPanel extends Mixins(BaseMixin) {
     mdiCloseCircle = mdiCloseCircle
 
     private boolShowObjects = false
-    private boolFirstLoad = true
 
     declare $refs: {
         bigThumbnail: any
     }
 
     private activeTab = 'files'
+    private lastFilename = ''
 
     get jobs() {
         return this.$store.getters['server/jobQueue/getJobs']
@@ -241,11 +241,10 @@ export default class StatusPanel extends Mixins(BaseMixin) {
 
     @Watch('current_filename')
     current_filenameChanged(newVal: string) {
-        if (this.current_filename === '' && newVal !== '') this.activeTab = 'status'
-        if (this.boolFirstLoad && newVal !== '') {
-            this.boolFirstLoad = false
-            this.activeTab = 'status'
-        }
+        if (newVal === '') this.activeTab = 'files'
+        else if (this.lastFilename !== newVal) this.activeTab = 'status'
+
+        this.lastFilename = newVal
     }
 
     clearDisplayMessage() {