diff --git a/frameworks/core/components_ng/base/view_abstract_model_ng.cpp b/frameworks/core/components_ng/base/view_abstract_model_ng.cpp
index e811a2aafc44ec22b35c7d335196b8c770c983ab..af3af24ce29951da3734a253c1b9a25ab1a7eff4 100644
--- a/frameworks/core/components_ng/base/view_abstract_model_ng.cpp
+++ b/frameworks/core/components_ng/base/view_abstract_model_ng.cpp
@@ -313,7 +313,7 @@ void ViewAbstractModelNG::BindContentCover(bool isShow, std::function<void(const
     targetNode->PushDestroyCallback(destructor);
 
     overlayManager->BindContentCover(isShow, std::move(callback), std::move(buildNodeFunc), modalStyle,
-        std::move(onAppear), std::move(onDisappear), targetNode->GetId());
+        std::move(onAppear), std::move(onDisappear), targetNode);
 }
 
 void ViewAbstractModelNG::RegisterContextMenuKeyEvent(
@@ -376,7 +376,7 @@ void ViewAbstractModelNG::BindSheet(bool isShow, std::function<void(const std::s
     targetNode->PushDestroyCallback(destructor);
 
     overlayManager->BindSheet(isShow, std::move(callback), std::move(buildNodeFunc), std::move(buildTitleNodeFunc),
-        sheetStyle, std::move(onAppear), std::move(onDisappear), std::move(shouldDismiss), targetNode->GetId());
+        sheetStyle, std::move(onAppear), std::move(onDisappear), std::move(shouldDismiss), targetNode);
 }
 
 void ViewAbstractModelNG::DismissSheet()
diff --git a/frameworks/core/components_ng/pattern/app_bar/app_bar_view.cpp b/frameworks/core/components_ng/pattern/app_bar/app_bar_view.cpp
index 8691d0b8b2b7fab62bf8f699a44165201bc7f010..cad19cca7524e2e417e7af895d1fdc90fe233075 100644
--- a/frameworks/core/components_ng/pattern/app_bar/app_bar_view.cpp
+++ b/frameworks/core/components_ng/pattern/app_bar/app_bar_view.cpp
@@ -162,8 +162,7 @@ RefPtr<FrameNode> AppBarView::BuildFaButton()
     auto pipeline = PipelineContext::GetCurrentContext();
     CHECK_NULL_RETURN(pipeline, nullptr);
     auto appBarTheme = pipeline->GetTheme<AppBarTheme>();
-    auto buttonId = buttonNode->GetId();
-    auto clickCallback = [pipeline, appBarTheme, buttonId](GestureEvent& info) {
+    auto clickCallback = [pipeline, appBarTheme, buttonNode](GestureEvent& info) {
 #ifdef PREVIEW
         LOGW("[Engine Log] Unable to show the SharePanel in the Previewer. Perform this operation on the "
              "emulator or a real device instead.");
@@ -176,7 +175,7 @@ RefPtr<FrameNode> AppBarView::BuildFaButton()
                 appBarTheme->GetBundleName().c_str(), appBarTheme->GetAbilityName().c_str());
             pipeline->FireSharePanelCallback(appBarTheme->GetBundleName(), appBarTheme->GetAbilityName());
         } else {
-            BindContentCover(buttonId);
+            BindContentCover(buttonNode);
         }
 #endif
     };
@@ -238,7 +237,7 @@ RefPtr<FrameNode> AppBarView::BuildIconButton(
     return buttonNode;
 }
 
-void AppBarView::BindContentCover(int32_t targetId)
+void AppBarView::BindContentCover(const RefPtr<FrameNode>& targetNode)
 {
     if (OHOS::Ace::AppBarHelper::QueryAppGalleryBundleName().empty()) {
         LOGE("UIExtension BundleName is empty.");
@@ -257,13 +256,13 @@ void AppBarView::BindContentCover(int32_t targetId)
     }
     NG::ModalStyle modalStyle;
     modalStyle.modalTransition = NG::ModalTransition::NONE;
-    auto buildNodeFunc = [targetId, overlayManager, &modalStyle, &stageAbilityName]() -> RefPtr<UINode> {
-        auto onRelease = [overlayManager, &modalStyle, targetId](int32_t releaseCode) {
-            overlayManager->BindContentCover(false, nullptr, nullptr, modalStyle, nullptr, nullptr, targetId);
+    auto buildNodeFunc = [targetNode, overlayManager, &modalStyle, &stageAbilityName]() -> RefPtr<UINode> {
+        auto onRelease = [overlayManager, &modalStyle, targetNode](int32_t releaseCode) {
+            overlayManager->BindContentCover(false, nullptr, nullptr, modalStyle, nullptr, nullptr, targetNode);
         };
-        auto onError = [overlayManager, &modalStyle, targetId](
+        auto onError = [overlayManager, &modalStyle, targetNode](
                            int32_t code, const std::string& name, const std::string& message) {
-            overlayManager->BindContentCover(false, nullptr, nullptr, modalStyle, nullptr, nullptr, targetId);
+            overlayManager->BindContentCover(false, nullptr, nullptr, modalStyle, nullptr, nullptr, targetNode);
         };
 
         // Create parameters of UIExtension.
@@ -295,7 +294,7 @@ void AppBarView::BindContentCover(int32_t targetId)
         uiExtNode->MarkModifyDone();
         return uiExtNode;
     };
-    overlayManager->BindContentCover(true, nullptr, std::move(buildNodeFunc), modalStyle, nullptr, nullptr, targetId);
+    overlayManager->BindContentCover(true, nullptr, std::move(buildNodeFunc), modalStyle, nullptr, nullptr, targetNode);
 }
 
 void AppBarView::SetVisible(bool visible)
diff --git a/frameworks/core/components_ng/pattern/app_bar/app_bar_view.h b/frameworks/core/components_ng/pattern/app_bar/app_bar_view.h
index 7bc737e106a544633078b9413f3f266f7d9b7977..db11ccb4cea24aafe90cec8110b815f48a3ebfb3 100644
--- a/frameworks/core/components_ng/pattern/app_bar/app_bar_view.h
+++ b/frameworks/core/components_ng/pattern/app_bar/app_bar_view.h
@@ -60,7 +60,7 @@ private:
     static RefPtr<FrameNode> BuildBarTitle();
     static RefPtr<FrameNode> BuildIconButton(
         InternalResource::ResourceId icon, GestureEventFunc&& clickCallback, bool isBackButton);
-    static void BindContentCover(int32_t targetId);
+    static void BindContentCover(const RefPtr<FrameNode>& targetNode);
     static RefPtr<FrameNode> BuildFaButton();
     static void SetEachIconColor(
         RefPtr<FrameNode> icon, const std::optional<Color>& color, InternalResource::ResourceId image);
diff --git a/frameworks/core/components_ng/pattern/overlay/overlay_manager.cpp b/frameworks/core/components_ng/pattern/overlay/overlay_manager.cpp
index 8990743a12887a0314ef4e3529b0ddd0d4bdd0ad..2e0fa58a588f54d2afd1e58d648064deddab5a18 100644
--- a/frameworks/core/components_ng/pattern/overlay/overlay_manager.cpp
+++ b/frameworks/core/components_ng/pattern/overlay/overlay_manager.cpp
@@ -1498,8 +1498,6 @@ bool OverlayManager::RemoveOverlay(bool isBackPressed, bool isPageRouter)
 
 bool OverlayManager::RemoveModalInOverlay()
 {
-    auto rootNode = rootNodeWeak_.Upgrade();
-    CHECK_NULL_RETURN(rootNode, true);
     auto topModalNode = modalStack_.top().Upgrade();
     CHECK_NULL_RETURN(topModalNode, false);
     if (topModalNode->GetTag() == V2::SHEET_PAGE_TAG) {
@@ -1510,6 +1508,10 @@ bool OverlayManager::RemoveModalInOverlay()
             return true;
         }
     }
+
+    auto rootNode = FindWindowScene(topModalNode);
+    CHECK_NULL_RETURN(rootNode, true);
+
     ModalPageLostFocus(topModalNode);
     auto pattern = topModalNode->GetPattern<PopupBasePattern>();
     if (isProhibitBack_ && pattern->GetTargetId() < 0) {
@@ -1533,7 +1535,7 @@ bool OverlayManager::RemoveModalInOverlay()
         auto modalTransition = modalPattern->GetType();
         if (modalTransition == ModalTransition::NONE || builder->GetRenderContext()->HasTransition()) {
             // Fire shown event of navdestination under the disappeared modal
-            FireNavigationStateChange(true);
+            FireNavigationStateChange(rootNode, true);
         }
     }
 
@@ -1544,14 +1546,14 @@ bool OverlayManager::RemoveModalInOverlay()
 
 bool OverlayManager::RemoveAllModalInOverlay()
 {
-    auto rootNode = rootNodeWeak_.Upgrade();
-    CHECK_NULL_RETURN(rootNode, true);
     while (!modalStack_.empty()) {
         auto topModalNode = modalStack_.top().Upgrade();
         if (!topModalNode) {
             modalStack_.pop();
             continue;
         }
+        auto rootNode = FindWindowScene(topModalNode);
+        CHECK_NULL_RETURN(rootNode, true);
         auto builder = AceType::DynamicCast<FrameNode>(topModalNode->GetFirstChild());
         CHECK_NULL_RETURN(builder, false);
         ModalPageLostFocus(topModalNode);
@@ -1571,7 +1573,7 @@ bool OverlayManager::RemoveAllModalInOverlay()
             auto modalTransition = modalPattern->GetType();
             if (modalTransition == ModalTransition::NONE || builder->GetRenderContext()->HasTransition()) {
                 // Fire shown event of navdestination under the disappeared modal
-                FireNavigationStateChange(true);
+                FireNavigationStateChange(rootNode, true);
             }
         }
 
@@ -1583,7 +1585,7 @@ bool OverlayManager::RemoveAllModalInOverlay()
 
 bool OverlayManager::ModalExitProcess(const RefPtr<FrameNode>& topModalNode)
 {
-    auto rootNode = rootNodeWeak_.Upgrade();
+    auto rootNode = FindWindowScene(topModalNode);
     CHECK_NULL_RETURN(rootNode, true);
     if (topModalNode->GetTag() == V2::MODAL_PAGE_TAG) {
         auto builder = AceType::DynamicCast<FrameNode>(topModalNode->GetFirstChild());
@@ -1593,7 +1595,7 @@ bool OverlayManager::ModalExitProcess(const RefPtr<FrameNode>& topModalNode)
             if (!topModalNode->GetPattern<ModalPresentationPattern>()->IsExecuteOnDisappear()) {
                 topModalNode->GetPattern<ModalPresentationPattern>()->OnDisappear();
                 // Fire hidden event of navdestination on the disappeared modal
-                FireNavigationStateChange(false, topModalNode);
+                FireNavigationStateChange(rootNode, false, topModalNode);
             }
             topModalNode->Clean(false, true);
             topModalNode->MarkDirtyNode(PROPERTY_UPDATE_MEASURE_SELF);
@@ -1605,7 +1607,7 @@ bool OverlayManager::ModalExitProcess(const RefPtr<FrameNode>& topModalNode)
         } else if (!builder->GetRenderContext()->HasTransition()) {
             topModalNode->GetPattern<ModalPresentationPattern>()->OnDisappear();
             // Fire hidden event of navdestination on the disappeared modal
-            FireNavigationStateChange(false, topModalNode);
+            FireNavigationStateChange(rootNode, false, topModalNode);
             rootNode->RemoveChild(topModalNode);
             rootNode->MarkDirtyNode(PROPERTY_UPDATE_MEASURE_SELF);
         }
@@ -1812,7 +1814,7 @@ void OverlayManager::SaveLastModalNode()
     }
 }
 
-void OverlayManager::FireNavigationStateChange(bool show, const RefPtr<UINode>& node)
+void OverlayManager::FireNavigationStateChange(const RefPtr<UINode>& root, bool show, const RefPtr<UINode>& node)
 {
     if (!show && node) {
         // Only check node When it is appointed
@@ -1828,9 +1830,7 @@ void OverlayManager::FireNavigationStateChange(bool show, const RefPtr<UINode>&
         return;
     }
 
-    auto rootNode = rootNodeWeak_.Upgrade();
-    CHECK_NULL_VOID(rootNode);
-    const auto& children = rootNode->GetChildren();
+    const auto& children = root->GetChildren();
     for (auto iter = children.begin(); iter != children.end(); ++iter) {
         auto& child = *iter;
         if (!show && child == topModalNode) {
@@ -1843,9 +1843,10 @@ void OverlayManager::FireNavigationStateChange(bool show, const RefPtr<UINode>&
 
 void OverlayManager::BindContentCover(bool isShow, std::function<void(const std::string&)>&& callback,
     std::function<RefPtr<UINode>()>&& buildNodeFunc, NG::ModalStyle& modalStyle, std::function<void()>&& onAppear,
-    std::function<void()>&& onDisappear, int32_t targetId)
+    std::function<void()>&& onDisappear, const RefPtr<FrameNode>& targetNode, int32_t sessionId)
 {
-    auto rootNode = rootNodeWeak_.Upgrade();
+    int32_t targetId = targetNode ? targetNode->GetId() : sessionId;
+    auto rootNode = FindWindowScene(targetNode);
     CHECK_NULL_VOID(rootNode);
     auto modalTransition = modalStyle.modalTransition;
     if (!modalTransition.has_value()) {
@@ -1893,7 +1894,7 @@ void OverlayManager::BindContentCover(bool isShow, std::function<void(const std:
             onAppear();
         }
         // Fire hidden event of navdestination under the appeared modal
-        FireNavigationStateChange(false);
+        FireNavigationStateChange(rootNode, false);
         if (modalTransition == ModalTransition::DEFAULT) {
             PlayDefaultModalTransition(modalNode, true);
         } else if (modalTransition == ModalTransition::ALPHA) {
@@ -1920,7 +1921,7 @@ void OverlayManager::BindContentCover(bool isShow, std::function<void(const std:
             if (!topModalNode->GetPattern<ModalPresentationPattern>()->IsExecuteOnDisappear()) {
                 topModalNode->GetPattern<ModalPresentationPattern>()->OnDisappear();
                 // Fire hidden event of navdestination on the disappeared modal
-                FireNavigationStateChange(false, topModalNode);
+                FireNavigationStateChange(rootNode, false, topModalNode);
             }
             topModalNode->Clean(false, true);
             topModalNode->MarkDirtyNode(PROPERTY_UPDATE_MEASURE_SELF);
@@ -1938,7 +1939,7 @@ void OverlayManager::BindContentCover(bool isShow, std::function<void(const std:
             if (!modalPresentationPattern->IsExecuteOnDisappear()) {
                 modalPresentationPattern->OnDisappear();
                 // Fire hidden event of navdestination on the disappeared modal
-                FireNavigationStateChange(false, topModalNode);
+                FireNavigationStateChange(rootNode, false, topModalNode);
             }
             rootNode->RemoveChild(topModalNode);
             rootNode->MarkDirtyNode(PROPERTY_UPDATE_MEASURE_SELF);
@@ -1949,7 +1950,7 @@ void OverlayManager::BindContentCover(bool isShow, std::function<void(const std:
         }
         if (modalTransition == ModalTransition::NONE || builder->GetRenderContext()->HasTransition()) {
             // Fire shown event of navdestination under the disappeared modal
-            FireNavigationStateChange(true);
+            FireNavigationStateChange(rootNode, true);
         }
         FireModalPageHide();
         SaveLastModalNode();
@@ -2042,19 +2043,20 @@ void OverlayManager::PlayDefaultModalTransition(const RefPtr<FrameNode>& modalNo
                 taskExecutor->PostTask(
                     [rootWeak, modalWK, overlayWeak, id]() {
                         auto modal = modalWK.Upgrade();
-                        auto root = rootWeak.Upgrade();
                         auto overlayManager = overlayWeak.Upgrade();
-                        CHECK_NULL_VOID(modal && root && overlayManager);
+                        CHECK_NULL_VOID(modal && overlayManager);
                         ContainerScope scope(id);
+                        auto root = overlayManager->FindWindowScene(modal);
+                        CHECK_NULL_VOID(root);
                         if (!modal->GetPattern<ModalPresentationPattern>()->IsExecuteOnDisappear()) {
                             modal->GetPattern<ModalPresentationPattern>()->OnDisappear();
                             // Fire hidden event of navdestination on the disappeared modal
-                            overlayManager->FireNavigationStateChange(false, modal);
+                            overlayManager->FireNavigationStateChange(root, false, modal);
                         }
                         root->RemoveChild(modal);
                         root->MarkDirtyNode(PROPERTY_UPDATE_MEASURE_SELF);
                         // Fire shown event of navdestination under the disappeared modal
-                        overlayManager->FireNavigationStateChange(true);
+                        overlayManager->FireNavigationStateChange(root, true);
                     },
                     TaskExecutor::TaskType::UI);
             });
@@ -2106,19 +2108,20 @@ void OverlayManager::PlayAlphaModalTransition(const RefPtr<FrameNode>& modalNode
                 taskExecutor->PostTask(
                     [rootWeak, modalWK, overlayWeak, id]() {
                         auto modal = modalWK.Upgrade();
-                        auto root = rootWeak.Upgrade();
                         auto overlayManager = overlayWeak.Upgrade();
-                        CHECK_NULL_VOID(modal && root && overlayManager);
+                        CHECK_NULL_VOID(modal && overlayManager);
                         ContainerScope scope(id);
+                        auto root = overlayManager->FindWindowScene(modal);
+                        CHECK_NULL_VOID(root);
                         if (!modal->GetPattern<ModalPresentationPattern>()->IsExecuteOnDisappear()) {
                             modal->GetPattern<ModalPresentationPattern>()->OnDisappear();
                             // Fire hidden event of navdestination on the disappeared modal
-                            overlayManager->FireNavigationStateChange(false, modal);
+                            overlayManager->FireNavigationStateChange(root, false, modal);
                         }
                         root->RemoveChild(modal);
                         root->MarkDirtyNode(PROPERTY_UPDATE_MEASURE_SELF);
                         // Fire shown event of navdestination under the disappeared modal
-                        overlayManager->FireNavigationStateChange(true);
+                        overlayManager->FireNavigationStateChange(root, true);
                     },
                     TaskExecutor::TaskType::UI);
             });
@@ -2129,9 +2132,10 @@ void OverlayManager::PlayAlphaModalTransition(const RefPtr<FrameNode>& modalNode
 void OverlayManager::BindSheet(bool isShow, std::function<void(const std::string&)>&& callback,
     std::function<RefPtr<UINode>()>&& buildNodeFunc, std::function<RefPtr<UINode>()>&& buildtitleNodeFunc,
     NG::SheetStyle& sheetStyle, std::function<void()>&& onAppear, std::function<void()>&& onDisappear,
-    std::function<void()>&& shouldDismiss, int32_t targetId)
+    std::function<void()>&& shouldDismiss, const RefPtr<FrameNode>& targetNode)
 {
-    auto rootNode = rootNodeWeak_.Upgrade();
+    int32_t targetId = targetNode->GetId();
+    auto rootNode = FindWindowScene(targetNode);
     CHECK_NULL_VOID(rootNode);
     auto pipeline = PipelineContext::GetCurrentContext();
     CHECK_NULL_VOID(pipeline);
@@ -2332,7 +2336,8 @@ void OverlayManager::PlaySheetTransition(
             option.GetOnFinishEvent());
     } else {
         option.SetOnFinishEvent(
-            [rootWeak = rootNodeWeak_, sheetWK = WeakClaim(RawPtr(sheetNode)), id = Container::CurrentId()] {
+            [rootWeak = rootNodeWeak_, sheetWK = WeakClaim(RawPtr(sheetNode)), id = Container::CurrentId(),
+                    weakOverlayManager = WeakClaim(this)] {
                 ContainerScope scope(id);
                 auto context = PipelineContext::GetCurrentContext();
                 CHECK_NULL_VOID(context);
@@ -2340,14 +2345,16 @@ void OverlayManager::PlaySheetTransition(
                 CHECK_NULL_VOID(taskExecutor);
                 // animation finish event should be posted to UI thread.
                 taskExecutor->PostTask(
-                    [rootWeak, sheetWK, id]() {
+                    [rootWeak, sheetWK, id, weakOverlayManager]() {
                         auto sheet = sheetWK.Upgrade();
-                        auto root = rootWeak.Upgrade();
-                        CHECK_NULL_VOID(sheet && root);
+                        auto overlayManager = weakOverlayManager.Upgrade();
+                        CHECK_NULL_VOID(sheet && overlayManager);
                         ContainerScope scope(id);
                         if (!sheet->GetPattern<SheetPresentationPattern>()->IsExecuteOnDisappear()) {
                             sheet->GetPattern<SheetPresentationPattern>()->OnDisappear();
                         }
+                        auto root = overlayManager->FindWindowScene(sheet);
+                        CHECK_NULL_VOID(root);
                         root->RemoveChild(sheet);
                         root->MarkDirtyNode(PROPERTY_UPDATE_MEASURE_SELF);
                     },
@@ -2381,7 +2388,8 @@ void OverlayManager::PlayBubbleStyleSheetTransition(RefPtr<FrameNode> sheetNode,
     } else {
         sheetPattern->StartOffsetExitingAnimation();
         sheetPattern->StartAlphaExitingAnimation(
-            [rootWeak = rootNodeWeak_, sheetWK = WeakClaim(RawPtr(sheetNode)), id = Container::CurrentId()] {
+            [rootWeak = rootNodeWeak_, sheetWK = WeakClaim(RawPtr(sheetNode)), id = Container::CurrentId(),
+                    weakOverlayManager = WeakClaim(this)] {
                 ContainerScope scope(id);
                 auto context = PipelineContext::GetCurrentContext();
                 CHECK_NULL_VOID(context);
@@ -2389,14 +2397,17 @@ void OverlayManager::PlayBubbleStyleSheetTransition(RefPtr<FrameNode> sheetNode,
                 CHECK_NULL_VOID(taskExecutor);
                 // animation finish event should be posted to UI thread.
                 taskExecutor->PostTask(
-                    [rootWeak, sheetWK, id]() {
+                    [rootWeak, sheetWK, id, weakOverlayManager]() {
                         auto sheet = sheetWK.Upgrade();
-                        auto root = rootWeak.Upgrade();
-                        CHECK_NULL_VOID(sheet && root);
+                        auto overlayManager = weakOverlayManager.Upgrade();
+                        CHECK_NULL_VOID(sheet && overlayManager);
+
                         ContainerScope scope(id);
                         if (!sheet->GetPattern<SheetPresentationPattern>()->IsExecuteOnDisappear()) {
                             sheet->GetPattern<SheetPresentationPattern>()->OnDisappear();
                         }
+                        auto root = overlayManager->FindWindowScene(sheet);
+                        CHECK_NULL_VOID(root);
                         root->RemoveChild(sheet);
                         root->MarkDirtyNode(PROPERTY_UPDATE_MEASURE_SELF);
                     },
@@ -2423,7 +2434,8 @@ void OverlayManager::PlaySheetMaskTransition(RefPtr<FrameNode> maskNode, bool is
             eventConfirmHub->RemoveClickEvent(sheetMaskClickEvent_);
         }
         option.SetOnFinishEvent(
-            [rootWeak = rootNodeWeak_, maskNodeWK = WeakClaim(RawPtr(maskNode)), id = Container::CurrentId()] {
+            [rootWeak = rootNodeWeak_, maskNodeWK = WeakClaim(RawPtr(maskNode)), id = Container::CurrentId(),
+                    weakOverlayManager = WeakClaim(this)] {
                 ContainerScope scope(id);
                 auto context = PipelineContext::GetCurrentContext();
                 CHECK_NULL_VOID(context);
@@ -2431,11 +2443,14 @@ void OverlayManager::PlaySheetMaskTransition(RefPtr<FrameNode> maskNode, bool is
                 CHECK_NULL_VOID(taskExecutor);
                 // animation finish event should be posted to UI thread.
                 taskExecutor->PostTask(
-                    [rootWeak, maskNodeWK, id]() {
+                    [rootWeak, maskNodeWK, id, weakOverlayManager]() {
                         auto mask = maskNodeWK.Upgrade();
-                        auto root = rootWeak.Upgrade();
-                        CHECK_NULL_VOID(mask);
+                        auto overlayManager = weakOverlayManager.Upgrade();
+                        CHECK_NULL_VOID(mask && overlayManager);
+
                         ContainerScope scope(id);
+                        auto root = overlayManager->FindWindowScene(mask);
+                        CHECK_NULL_VOID(root);
                         root->RemoveChild(mask);
                     },
                     TaskExecutor::TaskType::UI);
@@ -2602,7 +2617,7 @@ void OverlayManager::DestroySheet(const RefPtr<FrameNode>& sheetNode, int32_t ta
         if (topSheetNode->GetPattern<SheetPresentationPattern>()->GetTargetId() != targetId) {
             return;
         }
-        auto rootNode = rootNodeWeak_.Upgrade();
+        auto rootNode = FindWindowScene(sheetNode);
         CHECK_NULL_VOID(rootNode);
         auto root = DynamicCast<FrameNode>(rootNode);
         ModalPageLostFocus(topSheetNode);
@@ -2642,13 +2657,13 @@ void OverlayManager::DeleteModal(int32_t targetId)
         if (currentTargetId == targetId) {
             isDelete = true;
             modalList_.erase(modal);
-            auto rootNode = rootNodeWeak_.Upgrade();
+            auto rootNode = FindWindowScene(modalNode);
             CHECK_NULL_VOID(rootNode);
             if (isModal) {
                 modalNode->GetPattern<ModalPresentationPattern>()->OnDisappear();
                 modalNode->GetPattern<ModalPresentationPattern>()->FireCallback("false");
                 // Fire hidden event of navdestination on the disappeared modal
-                FireNavigationStateChange(false, modalNode);
+                FireNavigationStateChange(rootNode, false, modalNode);
             } else {
                 modalNode->GetPattern<SheetPresentationPattern>()->OnDisappear();
                 modalNode->GetPattern<SheetPresentationPattern>()->FireCallback("false");
@@ -2681,10 +2696,11 @@ RefPtr<FrameNode> OverlayManager::GetSheetMask(const RefPtr<FrameNode>& sheetNod
     }
     --sheetChildIter;
     CHECK_NULL_RETURN((*sheetChildIter), NULL);
-    if (DynamicCast<FrameNode>(*sheetChildIter)->GetTag() != V2::SHEET_MASK_TAG) {
+    auto sheetChildFrameNode = DynamicCast<FrameNode>(*sheetChildIter);
+    if (sheetChildFrameNode && sheetChildFrameNode->GetTag() != V2::SHEET_MASK_TAG) {
         return NULL;
     }
-    return DynamicCast<FrameNode>(*sheetChildIter);
+    return sheetChildFrameNode;
 }
 
 void OverlayManager::PlayKeyboardTransition(RefPtr<FrameNode> customKeyboard, bool isTransitionIn)
@@ -3080,7 +3096,7 @@ int32_t OverlayManager::CreateModalUIExtension(
     };
     auto sessionId = ModalUIExtension::GetSessionId(uiExtNode);
     // Convert the sessionId into a negative number to distinguish it from the targetId of other modal pages
-    BindContentCover(true, nullptr, std::move(buildNodeFunc), modalStyle, nullptr, nullptr, -(sessionId));
+    BindContentCover(true, nullptr, std::move(buildNodeFunc), modalStyle, nullptr, nullptr, nullptr, -(sessionId));
     return sessionId;
 }
 
@@ -3088,7 +3104,7 @@ void OverlayManager::CloseModalUIExtension(int32_t sessionId)
 {
     ModalStyle modalStyle;
     modalStyle.modalTransition = NG::ModalTransition::NONE;
-    BindContentCover(false, nullptr, nullptr, modalStyle, nullptr, nullptr, -(sessionId));
+    BindContentCover(false, nullptr, nullptr, modalStyle, nullptr, nullptr, nullptr, -(sessionId));
 }
 
 RefPtr<FrameNode> OverlayManager::BindUIExtensionToMenu(const RefPtr<FrameNode>& uiExtNode,
diff --git a/frameworks/core/components_ng/pattern/overlay/overlay_manager.h b/frameworks/core/components_ng/pattern/overlay/overlay_manager.h
index d6f3e2e323828c21981ccd5e14e8d2bc2b3d9f4d..525a543c0d2feaba59f4899f43a8c13d1d305bda 100644
--- a/frameworks/core/components_ng/pattern/overlay/overlay_manager.h
+++ b/frameworks/core/components_ng/pattern/overlay/overlay_manager.h
@@ -247,12 +247,12 @@ public:
 #endif // ENABLE_DRAG_FRAMEWORK
     void BindContentCover(bool isShow, std::function<void(const std::string&)>&& callback,
         std::function<RefPtr<UINode>()>&& buildNodeFunc, NG::ModalStyle& modalStyle, std::function<void()>&& onAppear,
-        std::function<void()>&& onDisappear, int32_t targetId);
+        std::function<void()>&& onDisappear, const RefPtr<FrameNode>& targetNode, int32_t sessionId = 0);
 
     void BindSheet(bool isShow, std::function<void(const std::string&)>&& callback,
         std::function<RefPtr<UINode>()>&& buildNodeFunc, std::function<RefPtr<UINode>()>&& buildTitleNodeFunc,
         NG::SheetStyle& sheetStyle, std::function<void()>&& onAppear, std::function<void()>&& onDisappear,
-        std::function<void()>&& shouldDismiss, int32_t targetId);
+        std::function<void()>&& shouldDismiss, const RefPtr<FrameNode>& targetNode);
 
     void CloseSheet(int32_t targetId);
 
@@ -352,7 +352,7 @@ private:
     void RemoveDialogFromMap(const RefPtr<FrameNode>& node);
     bool DialogInMapHoldingFocus();
     void PlayKeyboardTransition(RefPtr<FrameNode> customKeyboard, bool isTransitionIn);
-    void FireNavigationStateChange(bool show, const RefPtr<UINode>& node = nullptr);
+    void FireNavigationStateChange(const RefPtr<UINode>& root, bool show, const RefPtr<UINode>& node = nullptr);
     void PlayBubbleStyleSheetTransition(RefPtr<FrameNode> sheetNode, bool isTransitionIn);
 
     // Key: target Id, Value: PopupInfo
diff --git a/test/unittest/core/pattern/app_bar/app_bar_test_ng.cpp b/test/unittest/core/pattern/app_bar/app_bar_test_ng.cpp
index 26e5ee8a4286f1f4ac18151f9abe6d5414dbb0ab..be552b43e6639855923caef978f0f4403683ace8 100644
--- a/test/unittest/core/pattern/app_bar/app_bar_test_ng.cpp
+++ b/test/unittest/core/pattern/app_bar/app_bar_test_ng.cpp
@@ -130,7 +130,7 @@ HWTEST_F(AppBarTestNg, Test003, TestSize.Level1)
     auto test = AceType::MakeRefPtr<FrameNode>("test", 1, AceType::MakeRefPtr<Pattern>());
     SystemProperties::SetExtSurfaceEnabled(true);
     auto frameNode = AppBarView::Create(test);
-    AppBarView::BindContentCover(0);
+    AppBarView::BindContentCover(nullptr);
     EXPECT_TRUE(frameNode);
     EXPECT_EQ(frameNode->GetChildren().size(), 3);
     auto titleBar = frameNode->GetChildAtIndex(0);
diff --git a/test/unittest/core/pattern/overlay/overlay_manager_test_ng.cpp b/test/unittest/core/pattern/overlay/overlay_manager_test_ng.cpp
index 24a9456e500b960111b124e005edf88177d86cb7..6b64f83fdaf64d14ae8cb6b3f5e4a03b1dd7d9f9 100644
--- a/test/unittest/core/pattern/overlay/overlay_manager_test_ng.cpp
+++ b/test/unittest/core/pattern/overlay/overlay_manager_test_ng.cpp
@@ -202,7 +202,6 @@ HWTEST_F(OverlayManagerTestNg, BindContentCover001, TestSize.Level1)
      * @tc.steps: step1. create target node.
      */
     auto targetNode = CreateTargetNode();
-    auto targetId = targetNode->GetId();
     auto stageNode = FrameNode::CreateFrameNode(
         V2::STAGE_ETS_TAG, ElementRegister::GetInstance()->MakeUniqueId(), AceType::MakeRefPtr<StagePattern>());
     auto rootNode = FrameNode::CreateFrameNode(V2::ROOT_ETS_TAG, 1, AceType::MakeRefPtr<RootPattern>());
@@ -231,7 +230,7 @@ HWTEST_F(OverlayManagerTestNg, BindContentCover001, TestSize.Level1)
     modalStyle.modalTransition = ModalTransition::NONE;
     bool isShow = true;
     auto overlayManager = AceType::MakeRefPtr<OverlayManager>(rootNode);
-    overlayManager->BindContentCover(isShow, nullptr, std::move(builderFunc), modalStyle, nullptr, nullptr, targetId);
+    overlayManager->BindContentCover(isShow, nullptr, std::move(builderFunc), modalStyle, nullptr, nullptr, targetNode);
     EXPECT_FALSE(overlayManager->modalStack_.empty());
     overlayManager->PlayDefaultModalTransition(rootNode, false);
     auto topModalNode = overlayManager->modalStack_.top().Upgrade();
@@ -255,7 +254,6 @@ HWTEST_F(OverlayManagerTestNg, BindContentCover002, TestSize.Level1)
      * @tc.steps: step1. create target node.
      */
     auto targetNode = CreateTargetNode();
-    auto targetId = targetNode->GetId();
     auto stageNode = FrameNode::CreateFrameNode(
         V2::STAGE_ETS_TAG, ElementRegister::GetInstance()->MakeUniqueId(), AceType::MakeRefPtr<StagePattern>());
     auto geometryNode = stageNode->GetGeometryNode();
@@ -289,7 +287,8 @@ HWTEST_F(OverlayManagerTestNg, BindContentCover002, TestSize.Level1)
     bool isShow = true;
     auto onAppear = []() {};
     auto overlayManager = AceType::MakeRefPtr<OverlayManager>(rootNode);
-    overlayManager->BindContentCover(isShow, nullptr, std::move(builderFunc), modalStyle, onAppear, nullptr, targetId);
+    overlayManager->BindContentCover(
+        isShow, nullptr, std::move(builderFunc), modalStyle, onAppear, nullptr, targetNode);
     EXPECT_FALSE(overlayManager->modalStack_.empty());
     auto topModalNode = overlayManager->modalStack_.top().Upgrade();
     EXPECT_NE(topModalNode, nullptr);
@@ -303,7 +302,7 @@ HWTEST_F(OverlayManagerTestNg, BindContentCover002, TestSize.Level1)
      * @tc.expected: the ModalTransition is updated successfully
      */
     modalStyle.modalTransition = ModalTransition::NONE;
-    overlayManager->BindContentCover(isShow, nullptr, std::move(builderFunc), modalStyle, nullptr, nullptr, targetId);
+    overlayManager->BindContentCover(isShow, nullptr, std::move(builderFunc), modalStyle, nullptr, nullptr, targetNode);
     topModalNode = overlayManager->modalStack_.top().Upgrade();
     EXPECT_NE(topModalNode, nullptr);
     topModalPattern = topModalNode->GetPattern<ModalPresentationPattern>();
@@ -316,11 +315,11 @@ HWTEST_F(OverlayManagerTestNg, BindContentCover002, TestSize.Level1)
      * @tc.expected: the backgroundColor is updated successfully
      */
     modalStyle.backgroundColor = Color::GREEN;
-    overlayManager->BindContentCover(isShow, nullptr, std::move(builderFunc), modalStyle, nullptr, nullptr, targetId);
+    overlayManager->BindContentCover(isShow, nullptr, std::move(builderFunc), modalStyle, nullptr, nullptr, targetNode);
     topModalNode = overlayManager->modalStack_.top().Upgrade();
     EXPECT_NE(topModalNode, nullptr);
     EXPECT_EQ(topModalNode->GetRenderContext()->GetBackgroundColorValue(), Color::GREEN);
-    overlayManager->BindContentCover(!isShow, nullptr, nullptr, modalStyle, nullptr, nullptr, targetId);
+    overlayManager->BindContentCover(!isShow, nullptr, nullptr, modalStyle, nullptr, nullptr, targetNode);
 }
 
 /**
@@ -334,7 +333,6 @@ HWTEST_F(OverlayManagerTestNg, BindContentCover003, TestSize.Level1)
      * @tc.steps: step1. create target node.
      */
     auto targetNode = CreateTargetNode();
-    auto targetId = targetNode->GetId();
     auto stageNode = FrameNode::CreateFrameNode(
         V2::STAGE_ETS_TAG, ElementRegister::GetInstance()->MakeUniqueId(), AceType::MakeRefPtr<StagePattern>());
     auto rootNode = FrameNode::CreateFrameNode(V2::ROOT_ETS_TAG, 1, AceType::MakeRefPtr<RootPattern>());
@@ -362,7 +360,7 @@ HWTEST_F(OverlayManagerTestNg, BindContentCover003, TestSize.Level1)
     modalStyle.modalTransition = ModalTransition::NONE;
     bool isShow = true;
     auto overlayManager = AceType::MakeRefPtr<OverlayManager>(rootNode);
-    overlayManager->BindContentCover(isShow, nullptr, std::move(builderFunc), modalStyle, nullptr, nullptr, targetId);
+    overlayManager->BindContentCover(isShow, nullptr, std::move(builderFunc), modalStyle, nullptr, nullptr, targetNode);
     EXPECT_FALSE(overlayManager->modalStack_.empty());
 
     /**
@@ -370,7 +368,7 @@ HWTEST_F(OverlayManagerTestNg, BindContentCover003, TestSize.Level1)
      * @tc.expected: destroy successfully
      */
     auto onDisappear = []() {};
-    overlayManager->BindContentCover(!isShow, nullptr, nullptr, modalStyle, nullptr, onDisappear, targetId);
+    overlayManager->BindContentCover(!isShow, nullptr, nullptr, modalStyle, nullptr, onDisappear, targetNode);
     EXPECT_TRUE(overlayManager->modalStack_.empty());
 }
 
@@ -385,7 +383,6 @@ HWTEST_F(OverlayManagerTestNg, BindSheet001, TestSize.Level1)
      * @tc.steps: step1. create target node.
      */
     auto targetNode = CreateTargetNode();
-    auto targetId = targetNode->GetId();
     ViewStackProcessor::GetInstance()->Push(targetNode);
     auto stageNode = FrameNode::CreateFrameNode(
         V2::STAGE_ETS_TAG, ElementRegister::GetInstance()->MakeUniqueId(), AceType::MakeRefPtr<StagePattern>());
@@ -426,7 +423,7 @@ HWTEST_F(OverlayManagerTestNg, BindSheet001, TestSize.Level1)
     bool isShow = true;
     auto overlayManager = AceType::MakeRefPtr<OverlayManager>(rootNode);
     overlayManager->BindSheet(isShow, nullptr, std::move(builderFunc), std::move(buildTitleNodeFunc), sheetStyle,
-        nullptr, nullptr, nullptr, targetId);
+        nullptr, nullptr, nullptr, targetNode);
     EXPECT_FALSE(overlayManager->modalStack_.empty());
     auto topSheetNode = overlayManager->modalStack_.top().Upgrade();
     EXPECT_FALSE(topSheetNode == nullptr);
@@ -506,7 +503,6 @@ HWTEST_F(OverlayManagerTestNg, RemoveAllModalInOverlay001, TestSize.Level1)
      * @tc.steps: step1. create target node.
      */
     auto targetNode = CreateTargetNode();
-    auto targetId = targetNode->GetId();
     auto stageNode = FrameNode::CreateFrameNode(
         V2::STAGE_ETS_TAG, ElementRegister::GetInstance()->MakeUniqueId(), AceType::MakeRefPtr<StagePattern>());
     auto rootNode = FrameNode::CreateFrameNode(V2::ROOT_ETS_TAG, 1, AceType::MakeRefPtr<RootPattern>());
@@ -545,7 +541,7 @@ HWTEST_F(OverlayManagerTestNg, RemoveAllModalInOverlay001, TestSize.Level1)
     bool isShow = true;
     auto overlayManager = AceType::MakeRefPtr<OverlayManager>(rootNode);
     overlayManager->BindSheet(isShow, nullptr, std::move(builderFunc), std::move(buildTitleNodeFunc), sheetStyle,
-        nullptr, nullptr, nullptr, targetId);
+        nullptr, nullptr, nullptr, targetNode);
     EXPECT_FALSE(overlayManager->modalStack_.empty());
     auto sheetNode = overlayManager->modalStack_.top().Upgrade();
     EXPECT_EQ(sheetNode->GetTag(), V2::SHEET_PAGE_TAG);
@@ -557,11 +553,11 @@ HWTEST_F(OverlayManagerTestNg, RemoveAllModalInOverlay001, TestSize.Level1)
     overlayManager->modalList_.pop_back();
     EXPECT_TRUE(overlayManager->RemoveAllModalInOverlay());
     overlayManager->BindSheet(isShow, nullptr, std::move(builderFunc), std::move(buildTitleNodeFunc), sheetStyle,
-        nullptr, nullptr, nullptr, targetId);
+        nullptr, nullptr, nullptr, targetNode);
     EXPECT_TRUE(overlayManager->RemoveAllModalInOverlay());
 
     overlayManager->BindSheet(isShow, nullptr, std::move(builderFunc), std::move(buildTitleNodeFunc), sheetStyle,
-        nullptr, nullptr, nullptr, targetId);
+        nullptr, nullptr, nullptr, targetNode);
     sheetNode = overlayManager->modalStack_.top().Upgrade();
     sheetNode->tag_ = V2::ROOT_ETS_TAG;
     EXPECT_TRUE(overlayManager->RemoveAllModalInOverlay());
@@ -578,7 +574,6 @@ HWTEST_F(OverlayManagerTestNg, BindSheet002, TestSize.Level1)
      * @tc.steps: step1. create target node.
      */
     auto targetNode = CreateTargetNode();
-    auto targetId = targetNode->GetId();
     auto stageNode = FrameNode::CreateFrameNode(
         V2::STAGE_ETS_TAG, ElementRegister::GetInstance()->MakeUniqueId(), AceType::MakeRefPtr<StagePattern>());
     auto rootNode = FrameNode::CreateFrameNode(V2::ROOT_ETS_TAG, 1, AceType::MakeRefPtr<RootPattern>());
@@ -619,7 +614,7 @@ HWTEST_F(OverlayManagerTestNg, BindSheet002, TestSize.Level1)
     auto onAppear = []() {};
     auto overlayManager = AceType::MakeRefPtr<OverlayManager>(rootNode);
     overlayManager->BindSheet(isShow, nullptr, std::move(builderFunc), std::move(buildTitleNodeFunc), sheetStyle,
-        onAppear, nullptr, nullptr, targetId);
+        onAppear, nullptr, nullptr, targetNode);
     EXPECT_FALSE(overlayManager->modalStack_.empty());
     auto topSheetNode = overlayManager->modalStack_.top().Upgrade();
     EXPECT_FALSE(topSheetNode == nullptr);
@@ -635,14 +630,14 @@ HWTEST_F(OverlayManagerTestNg, BindSheet002, TestSize.Level1)
     sheetStyle.sheetMode = SheetMode::AUTO;
     sheetStyle.showDragBar = false;
     overlayManager->BindSheet(isShow, nullptr, std::move(builderFunc), std::move(buildTitleNodeFunc), sheetStyle,
-        nullptr, nullptr, nullptr, targetId);
+        nullptr, nullptr, nullptr, targetNode);
     auto sheetNode = overlayManager->modalStack_.top().Upgrade();
     EXPECT_FALSE(topSheetNode == nullptr);
     auto sheetPattern = sheetNode->GetPattern<SheetPresentationPattern>();
     sheetPattern->InitialLayoutProps();
     sheetStyle.sheetMode = SheetMode::MEDIUM;
     overlayManager->BindSheet(isShow, nullptr, std::move(builderFunc), std::move(buildTitleNodeFunc), sheetStyle,
-        nullptr, nullptr, nullptr, targetId);
+        nullptr, nullptr, nullptr, targetNode);
     sheetNode = overlayManager->modalStack_.top().Upgrade();
     sheetPattern = sheetNode->GetPattern<SheetPresentationPattern>();
     sheetPattern->InitialLayoutProps();
@@ -658,11 +653,11 @@ HWTEST_F(OverlayManagerTestNg, BindSheet002, TestSize.Level1)
      */
     sheetStyle.backgroundColor = Color::GREEN;
     overlayManager->BindSheet(isShow, nullptr, std::move(builderFunc), std::move(buildTitleNodeFunc), sheetStyle,
-        nullptr, nullptr, nullptr, targetId);
+        nullptr, nullptr, nullptr, targetNode);
     sheetNode = overlayManager->modalStack_.top().Upgrade();
     EXPECT_FALSE(topSheetNode == nullptr);
     EXPECT_EQ(sheetNode->GetRenderContext()->GetBackgroundColorValue(), Color::GREEN);
-    overlayManager->BindSheet(!isShow, nullptr, nullptr, nullptr, sheetStyle, nullptr, nullptr, nullptr, targetId);
+    overlayManager->BindSheet(!isShow, nullptr, nullptr, nullptr, sheetStyle, nullptr, nullptr, nullptr, targetNode);
 }
 
 /**
@@ -716,7 +711,7 @@ HWTEST_F(OverlayManagerTestNg, DestroySheet003, TestSize.Level1)
     bool isShow = true;
     auto overlayManager = AceType::MakeRefPtr<OverlayManager>(rootNode);
     overlayManager->BindSheet(isShow, nullptr, std::move(builderFunc), std::move(buildTitleNodeFunc), sheetStyle,
-        nullptr, nullptr, nullptr, targetId);
+        nullptr, nullptr, nullptr, targetNode);
     EXPECT_FALSE(overlayManager->modalStack_.empty());
     auto sheetNode = overlayManager->modalStack_.top().Upgrade();
     EXPECT_EQ(sheetNode->GetTag(), V2::SHEET_PAGE_TAG);
@@ -740,11 +735,13 @@ HWTEST_F(OverlayManagerTestNg, DestroySheet003, TestSize.Level1)
     overlayManager->DestroySheet(sheetNode, targetId);
     EXPECT_TRUE(overlayManager->modalStack_.empty());
 
+    auto targetNodeSecond = CreateTargetNode();
+    targetNodeSecond->MountToParent(stageNode);
     overlayManager->BindSheet(isShow, nullptr, std::move(builderFunc), std::move(buildTitleNodeFunc), sheetStyle,
-        nullptr, nullptr, nullptr, targetId + 1);
+        nullptr, nullptr, nullptr, targetNodeSecond);
     EXPECT_FALSE(overlayManager->modalStack_.empty());
     overlayManager->BindSheet(isShow, nullptr, std::move(builderFunc), std::move(buildTitleNodeFunc), sheetStyle,
-        nullptr, nullptr, nullptr, targetId);
+        nullptr, nullptr, nullptr, targetNode);
     EXPECT_FALSE(overlayManager->modalStack_.empty());
     overlayManager->DestroySheet(sheetNode, targetId);
     EXPECT_FALSE(overlayManager->modalStack_.empty());
@@ -801,7 +798,7 @@ HWTEST_F(OverlayManagerTestNg, BindSheet003, TestSize.Level1)
     bool isShow = true;
     auto overlayManager = AceType::MakeRefPtr<OverlayManager>(rootNode);
     overlayManager->BindSheet(isShow, nullptr, std::move(builderFunc), std::move(buildTitleNodeFunc), sheetStyle,
-        nullptr, nullptr, nullptr, targetId);
+        nullptr, nullptr, nullptr, targetNode);
     EXPECT_FALSE(overlayManager->modalStack_.empty());
     auto sheetNode = overlayManager->modalStack_.top().Upgrade();
     EXPECT_EQ(sheetNode->GetTag(), V2::SHEET_PAGE_TAG);
@@ -811,7 +808,8 @@ HWTEST_F(OverlayManagerTestNg, BindSheet003, TestSize.Level1)
      * @tc.expected: destroy modal successfully.
      */
     auto onDisappear = []() {};
-    overlayManager->BindSheet(!isShow, nullptr, nullptr, nullptr, sheetStyle, nullptr, onDisappear, nullptr, targetId);
+    overlayManager->BindSheet(
+        !isShow, nullptr, nullptr, nullptr, sheetStyle, nullptr, onDisappear, nullptr, targetNode);
     overlayManager->modalList_.emplace_back(AceType::WeakClaim(AceType::RawPtr(stageNode)));
     overlayManager->DestroySheet(sheetNode, targetId);
     overlayManager->FindWindowScene(targetNode);
@@ -870,7 +868,7 @@ HWTEST_F(OverlayManagerTestNg, GetSheetMask001, TestSize.Level1)
     bool isShow = true;
     auto overlayManager = AceType::MakeRefPtr<OverlayManager>(rootNode);
     overlayManager->BindSheet(isShow, nullptr, std::move(builderFunc), std::move(buildTitleNodeFunc), sheetStyle,
-        nullptr, nullptr, nullptr, targetId);
+        nullptr, nullptr, nullptr, targetNode);
     EXPECT_FALSE(overlayManager->modalStack_.empty());
     auto sheetNode = overlayManager->modalStack_.top().Upgrade();
     EXPECT_EQ(sheetNode->GetTag(), V2::SHEET_PAGE_TAG);
@@ -882,10 +880,11 @@ HWTEST_F(OverlayManagerTestNg, GetSheetMask001, TestSize.Level1)
     auto maskNode = overlayManager->GetSheetMask(sheetNode);
     EXPECT_TRUE(maskNode == nullptr);
     auto onDisappear = []() {};
-    overlayManager->BindSheet(!isShow, nullptr, nullptr, nullptr, sheetStyle, nullptr, onDisappear, nullptr, targetId);
+    overlayManager->BindSheet(
+        !isShow, nullptr, nullptr, nullptr, sheetStyle, nullptr, onDisappear, nullptr, targetNode);
     sheetStyle.maskColor = Color::BLUE;
     overlayManager->BindSheet(isShow, nullptr, std::move(builderFunc), std::move(buildTitleNodeFunc), sheetStyle,
-        nullptr, nullptr, nullptr, targetId);
+        nullptr, nullptr, nullptr, targetNode);
     sheetNode = overlayManager->modalStack_.top().Upgrade();
     EXPECT_FALSE(sheetNode == nullptr);
     EXPECT_EQ(sheetNode->GetTag(), V2::SHEET_PAGE_TAG);
@@ -898,7 +897,8 @@ HWTEST_F(OverlayManagerTestNg, GetSheetMask001, TestSize.Level1)
      * @tc.steps: step5. destroy sheetNode.
      * @tc.expected: Make sure the maskNode is destroyed.
      */
-    overlayManager->BindSheet(!isShow, nullptr, nullptr, nullptr, sheetStyle, nullptr, onDisappear, nullptr, targetId);
+    overlayManager->BindSheet(
+        !isShow, nullptr, nullptr, nullptr, sheetStyle, nullptr, onDisappear, nullptr, targetNode);
     overlayManager->modalList_.emplace_back(AceType::WeakClaim(AceType::RawPtr(stageNode)));
     overlayManager->DestroySheet(sheetNode, targetId);
     overlayManager->FindWindowScene(targetNode);
@@ -1344,14 +1344,14 @@ HWTEST_F(OverlayManagerTestNg, DeleteModal001, TestSize.Level1)
     CreateSheetStyle(sheetStyle);
     bool isShow = true;
     overlayManager->BindSheet(isShow, nullptr, std::move(builderFunc), std::move(buildTitleNodeFunc), sheetStyle,
-        nullptr, nullptr, nullptr, targetId);
+        nullptr, nullptr, nullptr, targetNode);
     EXPECT_FALSE(overlayManager->modalStack_.empty());
     overlayManager->modalList_.emplace_back(nullptr);
     overlayManager->DeleteModal(targetId);
     EXPECT_EQ(overlayManager->modalList_.size(), 1);
 
     overlayManager->BindSheet(isShow, nullptr, std::move(builderFunc), std::move(buildTitleNodeFunc), sheetStyle,
-        nullptr, nullptr, nullptr, targetId);
+        nullptr, nullptr, nullptr, targetNode);
     EXPECT_FALSE(overlayManager->modalStack_.empty());
     overlayManager->modalList_.emplace_back(nullptr);
     overlayManager->DeleteModal(targetId + 1);
@@ -1476,7 +1476,6 @@ HWTEST_F(OverlayManagerTestNg, RemoveOverlayTest002, TestSize.Level1)
      * @tc.steps: step1. create target node.
      */
     auto targetNode = CreateTargetNode();
-    auto targetId = targetNode->GetId();
     auto stageNode = FrameNode::CreateFrameNode(
         V2::STAGE_ETS_TAG, ElementRegister::GetInstance()->MakeUniqueId(), AceType::MakeRefPtr<StagePattern>());
     auto rootNode = FrameNode::CreateFrameNode(V2::ROOT_ETS_TAG, 1, AceType::MakeRefPtr<RootPattern>());
@@ -1507,7 +1506,7 @@ HWTEST_F(OverlayManagerTestNg, RemoveOverlayTest002, TestSize.Level1)
     modalStyle.modalTransition = ModalTransition::NONE;
     bool isShow = true;
     auto overlayManager = AceType::MakeRefPtr<OverlayManager>(rootNode);
-    overlayManager->BindContentCover(isShow, nullptr, std::move(builderFunc), modalStyle, nullptr, nullptr, targetId);
+    overlayManager->BindContentCover(isShow, nullptr, std::move(builderFunc), modalStyle, nullptr, nullptr, targetNode);
     EXPECT_FALSE(overlayManager->modalStack_.empty());
     EXPECT_TRUE(overlayManager->RemoveOverlay(false));
 
@@ -1516,7 +1515,7 @@ HWTEST_F(OverlayManagerTestNg, RemoveOverlayTest002, TestSize.Level1)
      * @tc.expected: remove successfully.
      */
     modalStyle.modalTransition = ModalTransition::ALPHA;
-    overlayManager->BindContentCover(isShow, nullptr, std::move(builderFunc), modalStyle, nullptr, nullptr, targetId);
+    overlayManager->BindContentCover(isShow, nullptr, std::move(builderFunc), modalStyle, nullptr, nullptr, targetNode);
     EXPECT_TRUE(overlayManager->RemoveModalInOverlay());
 }
 
@@ -1811,7 +1810,6 @@ HWTEST_F(OverlayManagerTestNg, SheetPresentationPattern1, TestSize.Level1)
      * @tc.steps: step1. create target node.
      */
     auto targetNode = CreateTargetNode();
-    auto targetId = targetNode->GetId();
     auto stageNode = FrameNode::CreateFrameNode(
         V2::STAGE_ETS_TAG, ElementRegister::GetInstance()->MakeUniqueId(), AceType::MakeRefPtr<StagePattern>());
     auto rootNode = FrameNode::CreateFrameNode(V2::ROOT_ETS_TAG, 1, AceType::MakeRefPtr<RootPattern>());
@@ -1847,7 +1845,7 @@ HWTEST_F(OverlayManagerTestNg, SheetPresentationPattern1, TestSize.Level1)
     auto onAppear = []() {};
     auto overlayManager = AceType::MakeRefPtr<OverlayManager>(rootNode);
     overlayManager->BindSheet(isShow, nullptr, std::move(builderFunc), std::move(buildTitleNodeFunc), sheetStyle,
-        onAppear, nullptr, nullptr, targetId);
+        onAppear, nullptr, nullptr, targetNode);
     EXPECT_FALSE(overlayManager->modalStack_.empty());
     auto topSheetNode = overlayManager->modalStack_.top().Upgrade();
     EXPECT_FALSE(topSheetNode == nullptr);
@@ -1859,7 +1857,7 @@ HWTEST_F(OverlayManagerTestNg, SheetPresentationPattern1, TestSize.Level1)
     sheetStyle.sheetMode = SheetMode::LARGE;
     sheetStyle.showDragBar = false;
     overlayManager->BindSheet(isShow, nullptr, std::move(builderFunc), std::move(buildTitleNodeFunc), sheetStyle,
-        nullptr, nullptr, nullptr, targetId);
+        nullptr, nullptr, nullptr, targetNode);
     auto sheetNode = overlayManager->modalStack_.top().Upgrade();
     EXPECT_FALSE(topSheetNode == nullptr);
     auto geometryNode = sheetNode->GetGeometryNode();