diff --git a/webapp/src/components/ButtonPrimeTable.vue b/webapp/src/components/ButtonPrimeTable.vue
index da1580c4e..333d404c1 100644
--- a/webapp/src/components/ButtonPrimeTable.vue
+++ b/webapp/src/components/ButtonPrimeTable.vue
@@ -25,6 +25,7 @@
       <button
         v-if="dataType === 'startingMaterials' && editableInventory"
         class="btn btn-default"
+        :disabled="itemsSelected.length === 0"
         @click="$emit('open-create-item-modal')"
       >
         Add a starting material
@@ -38,7 +39,12 @@
       </button>
     </div>
     <div class="button-right d-flex">
-      <button v-if="itemsSelected.length > 0" class="btn btn-default ml-2" @click="confirmDeletion">
+      <button
+        v-if="itemsSelected.length > 0"
+        class="btn btn-default ml-2"
+        :disabled="itemsSelected.length === 0"
+        @click="confirmDeletion"
+      >
         Delete selected
       </button>
       <IconField>
@@ -120,6 +126,7 @@ export default {
       } else if (this.dataType === "equipments") {
         this.deleteEquipments();
       }
+      this.$emit("delete-selected-items");
     },
     deleteSamples() {
       const idsSelected = this.itemsSelected.map((x) => x.item_id);
diff --git a/webapp/src/components/PrimeTable.vue b/webapp/src/components/PrimeTable.vue
index dc7bd83e0..35c43ce31 100644
--- a/webapp/src/components/PrimeTable.vue
+++ b/webapp/src/components/PrimeTable.vue
@@ -203,6 +203,9 @@ export default {
 
       return props;
     },
+    deleteSelectedItems() {
+      this.itemsSelected = [];
+    },
   },
 };
 </script>