diff --git a/UICatalog/Scenarios/SplitContainerNesting.cs b/UICatalog/Scenarios/SplitContainerNesting.cs
index 890876b25..c7faab8f3 100644
--- a/UICatalog/Scenarios/SplitContainerNesting.cs
+++ b/UICatalog/Scenarios/SplitContainerNesting.cs
@@ -199,7 +199,7 @@ namespace UICatalog.Scenarios {
 			newContainer.Panel2Title = cbTitles.Checked ? $"Panel {panelsCreated}" : string.Empty;
 
 			// Flip orientation
-			newContainer.Orientation = newContainer.Orientation == Orientation.Vertical ?
+			newContainer.Orientation = to.Orientation == Orientation.Vertical ?
 				Orientation.Horizontal :
 				Orientation.Vertical;
 			
diff --git a/UnitTests/SplitContainerTests.cs b/UnitTests/SplitContainerTests.cs
index 2e46b7c58..872805f6f 100644
--- a/UnitTests/SplitContainerTests.cs
+++ b/UnitTests/SplitContainerTests.cs
@@ -493,6 +493,7 @@ namespace UnitTests {
 
 			Assert.IsType<SplitContainer> (splitContainer.Panel1);
 			var left = (SplitContainer)splitContainer.Panel1;
+			Assert.Same (left.SuperView, splitContainer);
 
 			Assert.Equal (10, left.Panel1.Frame.Width);
 			Assert.Equal (5, left.Panel1.Frame.Height);