diff --git a/app/client/src/sagas/ContextSwitchingSaga.ts b/app/client/src/sagas/ContextSwitchingSaga.ts
index 884827ecca..a43b913ad5 100644
--- a/app/client/src/sagas/ContextSwitchingSaga.ts
+++ b/app/client/src/sagas/ContextSwitchingSaga.ts
@@ -260,7 +260,7 @@ function* getEntitiesForSet(
     state?.invokedBy === NavigationMethod.AppSidebar
   ) {
     const currentAppId: string = yield select(getCurrentApplicationId);
-    const key = `${currentEntityInfo.appState}.${currentAppId}#${branch}`;
+    const key = `${currentEntityInfo.appState}.${currentAppId}.${currentEntityInfo.pageId}#${branch}`;
     entities.push({
       key,
       entityInfo: {