diff --git a/public/js/pages/WorkorderAdmin/WorkorderAdmin.js b/public/js/pages/WorkorderAdmin/WorkorderAdmin.js
index 2c3db0984..7333ff708 100644
--- a/public/js/pages/WorkorderAdmin/WorkorderAdmin.js
+++ b/public/js/pages/WorkorderAdmin/WorkorderAdmin.js
@@ -26,8 +26,6 @@ Vue.component('workorder-admin', {
             <traffic-light :deadline="row.deadlineDate" :status="row.status"/>
             <i :class="getStatusColumn(row.status).icon" :title="getStatusColumn(row.status).text"></i>
             <span class="ml-2">{{ getStatusColumn(row.status).text }}</span>
-            <tt-button v-if="row.status === 'intervention_required'" icon="ml-2 fas fa-check-circle text-success"
-                       @click="problemSolvedModalData = row" additional-class="btn-link btn-sm p-0" title="Auftrag auf Problem behoben setzen"/>
           </template>
 
           <template v-slot:companyname="{ row }">
@@ -47,8 +45,10 @@ Vue.component('workorder-admin', {
                 <div v-else><span>{{ row.companyName || 'N/A' }}</span></div>
               </div>
               <div class="d-flex align-items-center">
-                <tt-button v-if="!['completed', 'cancelled', 'new'].includes(row.status)" icon="fas fa-edit" @click="startCompanyEdit(row)"
+                <tt-button v-if="!['completed', 'new'].includes(row.status)" icon="fas fa-edit" @click="startCompanyEdit(row)"
                            additional-class="btn-link btn-sm p-0 ml-2" title="Zuweisung ändern"/>
+                <tt-button v-if="row.status === 'intervention_required'" icon="ml-2 fas fa-check-circle text-success"
+                           @click="problemSolvedModalData = row" additional-class="btn-link btn-sm p-0" title="Auftrag auf Problem behoben setzen"/>
                 <tt-button v-if="['intervention_required', 'assigned'].includes(row.status)" icon="fas fa-hard-hat" @click="openCivilEngineeringModal(row)"
                            additional-class="btn-link btn-sm p-0 ml-2 text-orange" title="Tiefbau benötigt"/>
                 <tt-button v-if="!['completed', 'cancelled'].includes(row.status)" icon="fas fa-ban" @click="cancelWorkorderModalData = row"
@@ -307,4 +307,4 @@ Vue.component('workorder-admin', {
             deep: true
         }
     }
-});
\ No newline at end of file
+});