diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets
index 1a66c939299926ae2cdb71424942f005a11b4d75..debdcf0feeca9fae0ebe8916e9a4b5a8553bb7be 100644
--- a/entry/src/main/ets/entryability/EntryAbility.ets
+++ b/entry/src/main/ets/entryability/EntryAbility.ets
@@ -19,41 +19,16 @@
 
 import { AbilityConstant, UIAbility, Want } from '@kit.AbilityKit';
 import { hilog } from '@kit.PerformanceAnalysisKit';
-import { Router, window } from '@kit.ArkUI';
-import { BusinessError } from '@kit.BasicServicesKit';
+import { window } from '@kit.ArkUI';
 
 export default class EntryAbility extends UIAbility {
   funcAbilityWant: Want | undefined = undefined;
   uiContext: UIContext | undefined = undefined;
 
-  // [Start goToSpecifyPage]
-  goToSpecifyPage(want: Want) {
-    let shortCutKey = want.parameters?.shortCutKey;
-
-    if (this.uiContext && shortCutKey && shortCutKey === 'CompanyPage') {
-      let router: Router = this.uiContext.getRouter();
-      this.uiContext.getRouter().pushUrl({
-        url: 'pages/GoCompany'
-      }).catch((err: BusinessError) => {
-        hilog.error(0x0000, 'testTag', `Failed to push url. Code is ${err.code},message is ${err.message}`);
-      });
-    }
-    if (this.uiContext && shortCutKey && shortCutKey === 'HousePage') {
-      let router: Router = this.uiContext.getRouter();
-      this.uiContext.getRouter().pushUrl({
-        url: 'pages/GoHouse'
-      }).catch((err: BusinessError) => {
-        hilog.error(0x0000, 'testTag', `Failed to push url. Code is ${err.code},message is ${err.message}`);
-      });
-    }
-  }
-  // [End goToSpecifyPage]
-
   // [Start onNewWant]
   onNewWant(want: Want, launchParam: AbilityConstant.LaunchParam): void {
     // Receive the parameters passed by UIAbility from the caller
-    this.goToSpecifyPage(want);
-
+    AppStorage.setOrCreate('want',want);
     hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onNewWant');
   }
   // [End onNewWant]
diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets
index e698780a7613f3c77335a901632bd70b3d06c1fb..32fb47348338b412534e8d0bae49b8382968a328 100644
--- a/entry/src/main/ets/pages/Index.ets
+++ b/entry/src/main/ets/pages/Index.ets
@@ -13,10 +13,13 @@
  * limitations under the License.
  */
 
-import { display, promptAction } from '@kit.ArkUI';
+import { display } from '@kit.ArkUI';
+import { i18n } from '@kit.LocalizationKit';
+import { Want } from '@kit.AbilityKit';
+import { BusinessError } from '@kit.BasicServicesKit';
+import { hilog } from '@kit.PerformanceAnalysisKit';
 import { GoHouse } from './GoHouse';
 import { GoCompany } from './GoCompany';
-import { i18n } from '@kit.LocalizationKit';
 
 @Entry
 @Component
@@ -61,6 +64,40 @@ struct Index {
     }
   }
 
+  // [Start goToSpecifyPage]
+  goToSpecifyPage(want?: Want) {
+    let shortCutKey = want?.parameters?.shortCutKey;
+
+    if (shortCutKey && shortCutKey === 'CompanyPage') {
+      this.getUIContext().getRouter().pushUrl({
+        url: 'pages/GoCompany'
+      }).catch((err: BusinessError) => {
+        hilog.error(0x0000, 'testTag', `Failed to push url. Code is ${err.code},message is ${err.message}`);
+      });
+    }
+    if (shortCutKey && shortCutKey === 'HousePage') {
+      this.getUIContext().getRouter().pushUrl({
+        url: 'pages/GoHouse'
+      }).catch((err: BusinessError) => {
+        hilog.error(0x0000, 'testTag', `Failed to push url. Code is ${err.code},message is ${err.message}`);
+      });
+    }
+  }
+
+  // [End goToSpecifyPage]
+
+  // [Start onPageShow]
+  onPageShow(): void {
+    if (AppStorage.has('want')) {
+      let want: Want | undefined = AppStorage.get('want');
+      if (want) {
+        this.goToSpecifyPage(want);
+        AppStorage.delete('want');
+      }
+    }
+  }
+  // [End onPageShow]
+
   showTips() {
     this.getUIContext().getPromptAction().showToast({
       message: $r('app.string.ui_displayed'),