diff --git a/ehr/resources/web/ehr/window/OpenSurgeryCasesWindow.js b/ehr/resources/web/ehr/window/OpenSurgeryCasesWindow.js
index 6a9415c94..b967db40b 100644
--- a/ehr/resources/web/ehr/window/OpenSurgeryCasesWindow.js
+++ b/ehr/resources/web/ehr/window/OpenSurgeryCasesWindow.js
@@ -268,6 +268,16 @@ Ext4.define('EHR.window.OpenSurgeryCasesWindow', {
                                     console.log('updating procedure with caseid');
                                     rec.set('caseid', row.objectid);
                                 }, this);
+
+                                this.caseUpdateStores.forEach(function(store){
+                                    if (store.getFields().get('caseid') && store.getFields().get('Id')){
+                                        store.each((rec) => {
+                                            if (rec.get('Id') == row.Id){
+                                                rec.set('caseid', row.objectid);
+                                            }
+                                        }, this);
+                                    }
+                                }, this);
                             }
                         }, this);
                     }
@@ -293,6 +303,16 @@ Ext4.define('EHR.window.OpenSurgeryCasesWindow', {
                                     console.log('updating procedure with caseid')
                                     rec.set('caseid', row.objectid);
                                 }, this);
+
+                                this.caseUpdateStores.forEach(function(store){
+                                    if (store.getFields().get('caseid') && store.getFields().get('Id')){
+                                        store.each((rec) => {
+                                            if (rec.get('Id') == row.Id){
+                                                rec.set('caseid', row.objectid);
+                                            }
+                                        }, this);
+                                    }
+                                }, this);
                             }
                         }, this);
                     }
@@ -336,7 +356,8 @@ EHR.DataEntryUtils.registerDataEntryFormButton('OPENSURGERYCASES', {
         }
 
         Ext4.create('EHR.window.OpenSurgeryCasesWindow', {
-            sourceStore: clientStore
+            sourceStore: clientStore,
+            caseUpdateStores: panel.storeCollection.clientStores.items,
         }).show();
     }
 });