diff --git a/package-lock.json b/package-lock.json
index 82edca0..74da2bd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@cxbox-ui/core",
-  "version": "1.37.1",
+  "version": "1.37.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 34375c5..57bd585 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cxbox-ui/core",
-  "version": "1.37.1",
+  "version": "1.37.2",
   "main": "cxbox-ui-core.js",
   "exports": {
     ".": "./cxbox-ui-core.js",
diff --git a/src/reducers/screen.ts b/src/reducers/screen.ts
index 10b0423..5c99fa0 100644
--- a/src/reducers/screen.ts
+++ b/src/reducers/screen.ts
@@ -412,6 +412,8 @@ export function screen(state = initialState, action: AnyAction, store: Store): S
             }
         }
         case types.showViewPopup: {
+            const currentPage = state.bo.bc[action.payload.bcName]?.page ?? 1
+
             return {
                 ...state,
                 bo: {
@@ -420,7 +422,7 @@ export function screen(state = initialState, action: AnyAction, store: Store): S
                         ...state.bo.bc,
                         [action.payload.bcName]: {
                             ...state.bo.bc[action.payload.bcName],
-                            page: 1,
+                            page: action.payload.bcName === action.payload.calleeBCName ? currentPage : 1,
                             loading: action.payload.bcName !== action.payload.calleeBCName
                         }
                     }
diff --git a/webpack.config.js b/webpack.config.js
index 980a77e..765254e 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -112,6 +112,7 @@ module.exports = (_env, options) => {
                     use: {
                         loader: 'ts-loader',
                         options: {
+                            configFile: path.resolve(__dirname, './tsconfig.json'),
                             getCustomTransformers: function() {
                                 return {
                                     before: [