diff --git a/src/components/ADempiere/ContextMenu/contextMenuMixin.js b/src/components/ADempiere/ContextMenu/contextMenuMixin.js
index 985e358c..538318f0 100644
--- a/src/components/ADempiere/ContextMenu/contextMenuMixin.js
+++ b/src/components/ADempiere/ContextMenu/contextMenuMixin.js
@@ -170,7 +170,7 @@ export default {
     },
     getOldRouteOfWindow() {
       if (this.panelType === 'window') {
-        const oldRoute = this.$store.state.window.windowOldRoute
+        const oldRoute = this.$store.state['windowControl/index'].windowOldRoute
         if (!this.isEmptyValue(oldRoute.query.action) && oldRoute.query.action !== 'create-new' && this.$route.query.action === 'create-new') {
           return oldRoute
         }
diff --git a/src/components/ADempiere/Dialog/index.vue b/src/components/ADempiere/Dialog/index.vue
index c09c10e3..9727c808 100644
--- a/src/components/ADempiere/Dialog/index.vue
+++ b/src/components/ADempiere/Dialog/index.vue
@@ -96,7 +96,7 @@ export default {
       return this.$store.state['process/index'].metadata
     },
     windowRecordSelected() {
-      return this.$store.state.window.recordSelected
+      return this.$store.state['windowControl/index'].recordSelected
     },
     getterDataRecordsAndSelection() {
       return this.$store.getters.getDataRecordAndSelection(this.containerUuid)