diff --git a/ayanova/src/api/gzform.js b/ayanova/src/api/gzform.js
index d7aa1896..8bcc2128 100644
--- a/ayanova/src/api/gzform.js
+++ b/ayanova/src/api/gzform.js
@@ -971,8 +971,13 @@ export default {
   //  Set last report used in form settings
   //
   setLastReport(formKey, reportSelected) {
+    // console.log("setLastReport called", {
+    //   formKey: formKey,
+    //   reportSelected: reportSelected
+    // });
     let fs = window.$gz.store.state.formSettings[formKey];
-    if (fs == null || fs.lastReport == null) {
+    //console.log("setlast report retrieved formsettings is:",fs)
+    if (fs == null) {
       fs = {};
     }
     fs.lastReport = reportSelected;
diff --git a/ayanova/src/views/svc-workorder.vue b/ayanova/src/views/svc-workorder.vue
index 39d67fd4..77ef1641 100644
--- a/ayanova/src/views/svc-workorder.vue
+++ b/ayanova/src/views/svc-workorder.vue
@@ -1921,6 +1921,7 @@ async function clickHandler(menuItem) {
           return;
         }
         window.$gz.form.setLastReport(FORM_KEY, res);
+        generateMenu(m.vm);
         break;
       case "statuslist":
         m.vm.$router.push({
diff --git a/ayanova/src/views/svc-workorders.vue b/ayanova/src/views/svc-workorders.vue
index ba60eea3..619ee83f 100644
--- a/ayanova/src/views/svc-workorders.vue
+++ b/ayanova/src/views/svc-workorders.vue
@@ -212,6 +212,7 @@ async function clickHandler(menuItem) {
             return;
           }
           window.$gz.form.setLastReport(FORM_KEY, res);
+          generateMenu(m.vm); //refresh the menu with the new report
         }
         break;
       case "WorkOrderItemList":