diff --git a/MVMCoreUI/Alerts/MVMCoreAlertHandler+Extension.swift b/MVMCoreUI/Alerts/MVMCoreAlertHandler+Extension.swift
index b0158e2d..6f52ce93 100644
--- a/MVMCoreUI/Alerts/MVMCoreAlertHandler+Extension.swift
+++ b/MVMCoreUI/Alerts/MVMCoreAlertHandler+Extension.swift
@@ -52,7 +52,9 @@ public extension MVMCoreAlertHandler {
 extension MVMCoreAlertHandler: MVMCorePresentationDelegateProtocol {
     // Update displayable for each top alert operation when page type changes, in top queue priority order.
     public func navigationController(_ navigationController: UINavigationController, displayedViewController viewController: UIViewController) {
-        guard navigationController == MVMCoreUISplitViewController.main()?.navigationController  else { return }
+        guard topAlertQueue.operations.count > 0 else { return }
+        let viewController = MVMCoreUIUtility.getViewControllerTraversingManagers(viewController)
+        guard viewController == MVMCoreUISplitViewController.main()?.getCurrentViewController() else { return }
         let pageType = (viewController as? MVMCoreViewControllerProtocol)?.pageType
         topAlertQueue.operations.compactMap {
            $0 as? MVMCoreTopAlertOperation