diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
index 476e7264..342d4b06 100644
--- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
+++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
@@ -153,11 +153,11 @@ CGFloat const PanelAnimationDuration = 0.2;
 - (IBAction)leftPanelButtonPressed:(id)sender {
     [MVMCoreDispatchUtility performBlockOnMainThread:^{
         UIViewController *viewController = self.navigationController.topViewController;
-
+        UIViewController *detailViewController = [self getCurrentDetailViewController];
         // If Viewcontroller confirms to protocol and implements the the method leftPanelButtonPressed
-        if ([viewController conformsToProtocol:@protocol(MVMCoreUIDetailViewProtocol)]
-            && [viewController respondsToSelector:@selector(isOverridingLeftButton)]
-            && [((UIViewController <MVMCoreUIDetailViewProtocol> *)viewController) isOverridingLeftButton]) {
+        if ([detailViewController conformsToProtocol:@protocol(MVMCoreUIDetailViewProtocol)]
+            && [detailViewController respondsToSelector:@selector(isOverridingLeftButton)]
+            && [((UIViewController <MVMCoreUIDetailViewProtocol> *)detailViewController) isOverridingLeftButton]) {
             return;
         }
         
@@ -175,9 +175,9 @@ CGFloat const PanelAnimationDuration = 0.2;
 
 - (IBAction)backButtonPressed:(id)sender {
     [MVMCoreDispatchUtility performBlockOnMainThread:^{
-        UIViewController *viewController = self.navigationController.topViewController;
-        if ([viewController conformsToProtocol:@protocol(MVMCoreUIDetailViewProtocol)] && [viewController respondsToSelector:@selector(backButtonPressed)]) {
-            [((UIViewController <MVMCoreUIDetailViewProtocol> *)viewController) backButtonPressed];
+        UIViewController *detailViewController = [self getCurrentDetailViewController];
+        if ([detailViewController conformsToProtocol:@protocol(MVMCoreUIDetailViewProtocol)] && [detailViewController respondsToSelector:@selector(backButtonPressed)]) {
+            [((UIViewController <MVMCoreUIDetailViewProtocol> *)detailViewController) backButtonPressed];
         } else {
             [[MVMCoreNavigationHandler sharedNavigationHandler] popTopViewControllerAnimated:YES];
         }
@@ -187,11 +187,12 @@ CGFloat const PanelAnimationDuration = 0.2;
 - (IBAction)rightPanelButtonPressed:(id)sender {
     [MVMCoreDispatchUtility performBlockOnMainThread:^{
         UIViewController *viewController = self.navigationController.topViewController;
+        UIViewController *detailViewController = [self getCurrentDetailViewController];
 
         // If Viewcontroller confirms to protocol and implements the the method rightPanelButtonPressed
-        if ([viewController conformsToProtocol:@protocol(MVMCoreUIDetailViewProtocol)]
-            && [viewController respondsToSelector:@selector(isOverridingRightButton)]
-            && [((UIViewController <MVMCoreUIDetailViewProtocol> *)viewController) isOverridingRightButton]) {
+        if ([detailViewController conformsToProtocol:@protocol(MVMCoreUIDetailViewProtocol)]
+            && [detailViewController respondsToSelector:@selector(isOverridingRightButton)]
+            && [((UIViewController <MVMCoreUIDetailViewProtocol> *)detailViewController) isOverridingRightButton]) {
             return;
         }