diff --git a/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate b/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate
index e1fbbb66e794753300527cb69f3646d44d874c4e..9261d51fcf9f3ee213e8be9704a8071395f7fc87 100644
Binary files a/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate and b/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/openbis-ipad/openBIS/openBIS/CISDOBMasterViewController.m b/openbis-ipad/openBIS/openBIS/CISDOBMasterViewController.m
index e1148cd87e3cae6e19bea07a835d12d426f5d61b..d6621d5659c87a674f34c408fcd23a92ca7a0551 100644
--- a/openbis-ipad/openBIS/openBIS/CISDOBMasterViewController.m
+++ b/openbis-ipad/openBIS/openBIS/CISDOBMasterViewController.m
@@ -126,8 +126,11 @@
 {
     // Segue to the detail view unless we are on the ipad
     if ([[UIDevice currentDevice] userInterfaceIdiom] != UIUserInterfaceIdiomPad) return;
-
+    
     [self.openBisModel selectObjectAtIndexPath: indexPath];
+
+    // Figure out what to do with the detail view and the navigation view
+    self.detailViewController.openBisModel = self.openBisModel;
     if ([self.openBisModel selectionHasChildren]) {
         // Drill into the hierarchy
         UIStoryboard *storyboard = self.storyboard;
@@ -137,7 +140,6 @@
         [self.detailViewController selectionIsChanging];
     } else {
         // Show the current selection
-        self.detailViewController.openBisModel = self.openBisModel;
         [self.detailViewController selectionDidChange];
     }
 }