diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
index 861e13ac..50b50a84 100644
--- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
+++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
@@ -888,7 +888,7 @@ CGFloat const PanelAnimationDuration = 0.2;
 }
 
 - (UIViewController *)getCurrentVisibleController {
-    UIViewController *baseViewController = [MVMCoreNavigationHandler sharedNavigationHandler].viewControllerToPresentOn;
+    UIViewController *baseViewController = [MVMCoreNavigationHandler sharedNavigationHandler].viewControllerToPresentOn ?: [UIApplication sharedApplication].keyWindow.rootViewController;
     UIViewController *viewController = nil;
     while (baseViewController.presentedViewController && !baseViewController.presentedViewController.isBeingDismissed) {
         viewController = baseViewController.presentedViewController;