diff --git a/ayanova/src/views/inv-part-assembly.vue b/ayanova/src/views/inv-part-assembly.vue
index 249f44ab..315c7f28 100644
--- a/ayanova/src/views/inv-part-assembly.vue
+++ b/ayanova/src/views/inv-part-assembly.vue
@@ -205,24 +205,31 @@
             </v-card-text>
             <v-card-actions>
               <template v-if="!$vuetify.breakpoint.xs">
-                <v-btn color="red darken-1" text @click="deleteItem()">{{
+                <v-btn
+                  v-if="adding"
+                  color="red darken-1"
+                  text
+                  @click="deleteItem()"
+                  >{{ $ay.t("Cancel") }}</v-btn
+                >
+                <v-btn v-else color="red darken-1" text @click="deleteItem()">{{
                   $ay.t("Delete")
                 }}</v-btn>
                 <v-spacer></v-spacer>
 
-                <v-btn
+                <!-- <v-btn
                   color="blue darken-1"
                   text
                   class="ml-4"
                   @click="addItem()"
                   >{{ $ay.t("New") }}</v-btn
-                >
+                > -->
 
                 <v-btn
                   color="blue darken-1"
                   text
                   class="ml-4"
-                  @click="editItemDialog = false"
+                  @click="okClicked()"
                   >{{ $ay.t("OK") }}</v-btn
                 >
               </template>
@@ -234,19 +241,29 @@
                     block
                     text
                     color="blue darken-1"
-                    @click="editItemDialog = false"
+                    @click="okClicked()"
                     >{{ $ay.t("OK") }}</v-btn
                   >
-                  <v-btn
+                  <!-- <v-btn
                     class="mt-4"
                     block
                     text
                     color="blue darken-1"
                     @click="addItem()"
                     >{{ $ay.t("New") }}</v-btn
-                  >
+                  > -->
 
                   <v-btn
+                    v-if="adding"
+                    class="mt-8 mb-6"
+                    block
+                    text
+                    color="red darken-1"
+                    @click="deleteItem()"
+                    >{{ $ay.t("Cancel") }}</v-btn
+                  >
+                  <v-btn
+                    v-else
                     class="mt-8 mb-6"
                     block
                     text
@@ -296,7 +313,8 @@ export default {
       ayaType: window.$gz.type.PartAssembly,
       selectedPart: null,
       editItemDialog: false,
-      editItemIndex: 0
+      editItemIndex: 0,
+      adding: false
     };
   },
   watch: {
@@ -387,6 +405,13 @@ export default {
     window.$gz.eventBus.$off("menu-click", clickHandler);
   },
   methods: {
+    okClicked: function() {
+      //if nothing selected then remove this empty record
+      if (this.obj.items[this.editItemIndex].partId == null) {
+        this.deleteItem();
+      }
+      this.editItemDialog = false;
+    },
     addItem: function() {
       this.editItemIndex =
         this.obj.items.push({
@@ -394,10 +419,12 @@ export default {
           partAssemblyId: this.obj.id,
           partId: null
         }) - 1;
+      this.adding = true;
       this.editItemDialog = true;
       this.formState.dirty = true;
     },
     editItem: function(index) {
+      this.adding = false;
       this.editItemIndex = index;
       this.editItemDialog = true;
     },