diff --git a/ayanova/src/components/work-order-state.vue b/ayanova/src/components/work-order-state.vue
index 46e13585..34ca2372 100644
--- a/ayanova/src/components/work-order-state.vue
+++ b/ayanova/src/components/work-order-state.vue
@@ -5,7 +5,7 @@
     </div>
 
     <template v-if="hasState">
-      <div>
+      <div class="mb-6 mb-sm-0">
         <v-btn icon class="ml-n1 mr-2" @click="openDialog = true">
           <v-icon>{{ openIcon() }}</v-icon>
         </v-btn>
@@ -130,7 +130,7 @@
           </v-card-text>
           <v-card-actions>
             <v-spacer></v-spacer>
-            <v-btn color="blue darken-1" text @click="openDialog = false">{{
+            <v-btn color="blue darken-1" text @click="cancelDialog()">{{
               $ay.t("Cancel")
             }}</v-btn>
             <v-btn
@@ -260,9 +260,7 @@ export default {
           created: window.$gz.locale.nowUTC8601String()
         });
 
-        //flag header itself as dirty
-        //this.value.isDirty = true; //Not sure why this is here
-
+        this.selectedStatus = null;
         //flag form dirty
         this.pvm.formState.dirty = true;
       }
@@ -306,7 +304,11 @@ export default {
       return "$ayiHistory";
     },
     save() {
-      console.log("STUB: doSAVE clicked");
+      this.addState();
+      this.openDialog = false;
+    },
+    cancelDialog() {
+      this.selectedStatus = null;
       this.openDialog = false;
     },
     fieldValueChanged(ref) {