diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectView.xaml b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectView.xaml
index e727f53b25..6a8582065c 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectView.xaml
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectView.xaml
@@ -113,39 +113,42 @@
 			<Label
 				Grid.Row="6"
 				Margin="0, 20, 0, 0"
+				IsEnabled="{Binding Path=IsContentPageEnabled}"
 				Visibility="{Binding Path=IsAspxViewEngineSelected, Converter={StaticResource BoolToVisibility}}"
 				Content="Use Master Page:"/>
 			<Label
 				Grid.Row="6"
 				Margin="0, 20, 0, 0"
+				IsEnabled="{Binding Path=IsContentPageEnabled}"
 				Visibility="{Binding Path=IsRazorViewEngineSelected, Converter={StaticResource BoolToVisibility}}"
 				Content="Use Layout:"/>
 			<CheckBox
 				Grid.Column="1"
 				Grid.Row="6"
 				Margin="0, 28, 0, 0"
+				IsEnabled="{Binding Path=IsContentPageEnabled}"
 				IsChecked="{Binding Path=IsContentPage}"/>
 			
 			<Label
 				Grid.Row="7"
 				Visibility="{Binding Path=IsAspxViewEngineSelected, Converter={StaticResource BoolToVisibility}}"
-				IsEnabled="{Binding Path=IsContentPage}"
+				IsEnabled="{Binding Path=IsContentPagePropertiesEnabled}"
 				Content="Master Page:"/>
 			<Label
 				Grid.Row="7"
 				Visibility="{Binding Path=IsRazorViewEngineSelected, Converter={StaticResource BoolToVisibility}}"
-				IsEnabled="{Binding Path=IsContentPage}"
+				IsEnabled="{Binding Path=IsContentPagePropertiesEnabled}"
 				Content="Layout:"/>
 			<Grid 
 				Grid.Row="7"
-				Grid.Column="1">
+				Grid.Column="1"
+				IsEnabled="{Binding Path=IsContentPagePropertiesEnabled}">
 				<Grid.ColumnDefinitions>
 					<ColumnDefinition Width="*"/>
 					<ColumnDefinition Width="Auto"/>
 					<ColumnDefinition Width="Auto"/>
 				</Grid.ColumnDefinitions>
 				<TextBox
-					IsEnabled="{Binding Path=IsContentPage}"
 					Text="{Binding Path=MasterPageFile}"/>
 				<StackPanel
 					Grid.Column="2"
@@ -153,7 +156,6 @@
 					<Button
 						Padding="9, 0, 9, 0"
 						Style="{x:Null}"
-						IsEnabled="{Binding Path=IsContentPage}"
 						Content="..."
 						Command="{Binding Path=OpenSelectMasterPageViewCommand}"/>
 				</StackPanel>
@@ -162,13 +164,13 @@
 			<Label
 				Grid.Row="8"
 				Visibility="{Binding Path=IsAspxViewEngineSelected, Converter={StaticResource BoolToVisibility}}"
-				IsEnabled="{Binding Path=IsContentPage}"
+				IsEnabled="{Binding Path=IsContentPagePropertiesEnabled}"
 				Content="Main Content ID:"/>
 			<TextBox
 				Grid.Row="8"
 				Grid.Column="1"
 				Visibility="{Binding Path=IsAspxViewEngineSelected, Converter={StaticResource BoolToVisibility}}"
-				IsEnabled="{Binding Path=IsContentPage}"
+				IsEnabled="{Binding Path=IsContentPagePropertiesEnabled}"
 				Text="{Binding Path=PrimaryContentPlaceHolderId}"/>
 			
 			<StackPanel
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectViewModel.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectViewModel.cs
index dd8984ef87..3ff2328e76 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectViewModel.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/Src/AddMvcViewToProjectViewModel.cs
@@ -203,9 +203,18 @@ namespace ICSharpCode.AspNet.Mvc
 			set {
 				isContentPage = value;
 				OnPropertyChanged(viewModel => viewModel.IsContentPage);
+				OnPropertyChanged(viewModel => viewModel.IsContentPagePropertiesEnabled);
 			}
 		}
 		
+		public bool IsContentPageEnabled {
+			get { return !IsPartialView; }
+		}
+		
+		public bool IsContentPagePropertiesEnabled {
+			get { return IsContentPage && IsContentPageEnabled; }
+		}
+		
 		public bool CanAddMvcView()
 		{
 			return viewFileName.HasValidViewName();
@@ -275,7 +284,11 @@ namespace ICSharpCode.AspNet.Mvc
 		
 		public bool IsPartialView {
 			get { return viewFileName.IsPartialView; }
-			set { viewFileName.IsPartialView = value; }
+			set {
+				viewFileName.IsPartialView = value;
+				OnPropertyChanged(viewModel => viewModel.IsContentPageEnabled);
+				OnPropertyChanged(viewModel => viewModel.IsContentPagePropertiesEnabled);
+			}
 		}
 		
 		public bool IsStronglyTypedView {
diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/AddMvcViewToProjectViewModelTests.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/AddMvcViewToProjectViewModelTests.cs
index 3939845ae2..b52a0e33a5 100644
--- a/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/AddMvcViewToProjectViewModelTests.cs
+++ b/src/AddIns/BackendBindings/AspNet.Mvc/Test/Src/AddMvcViewToProjectViewModelTests.cs
@@ -1148,5 +1148,100 @@ namespace AspNet.Mvc.Tests
 			
 			Assert.IsTrue(fired);
 		}
+		
+		[Test]
+		public void IsContentPageEnabled_IsPartialViewIsNotSelected_ReturnsTrue()
+		{
+			CreateViewModel();
+			viewModel.IsPartialView = false;
+			bool enabled = viewModel.IsContentPageEnabled;
+			
+			Assert.IsTrue(enabled);
+		}
+		
+		[Test]
+		public void IsContentPageEnabled_IsPartialViewIsSelected_ReturnsFalse()
+		{
+			CreateViewModel();
+			viewModel.IsPartialView = true;
+			bool enabled = viewModel.IsContentPageEnabled;
+			
+			Assert.IsFalse(enabled);
+		}
+		
+		[Test]
+		public void IsPartialView_IsPartialViewChangedFromTrueToFalse_IsContentPageEnabledPropertyChangedEventIsFired()
+		{
+			CreateViewModel();
+			viewModel.IsPartialView = true;
+			MonitorPropertyChangedEvents();
+			viewModel.IsPartialView = false;
+			SelectRazorViewEngine();
+			
+			bool fired = propertyChangedEvents.Contains("IsContentPageEnabled");
+			
+			Assert.IsTrue(fired);
+		}
+		
+		[Test]
+		public void IsContentPagePropertiesEnabled_IsPartialViewIsNotSelectedAndIsContentPageIsSelected_ReturnsTrue()
+		{
+			CreateViewModel();
+			viewModel.IsPartialView = false;
+			viewModel.IsContentPage = true;
+			bool enabled = viewModel.IsContentPagePropertiesEnabled;
+			
+			Assert.IsTrue(enabled);
+		}
+		
+		[Test]
+		public void IsContentPagePropertiesEnabled_IsPartialViewIsNotSelectedAndIsContentPageIsNotSelected_ReturnsFalse()
+		{
+			CreateViewModel();
+			viewModel.IsPartialView = false;
+			viewModel.IsContentPage = false;
+			bool enabled = viewModel.IsContentPagePropertiesEnabled;
+			
+			Assert.IsFalse(enabled);
+		}
+		
+		[Test]
+		public void IsContentPagePropertiesEnabled_IsPartialViewIsSelectedAndIsContentPageIsSelected_ReturnsFalse()
+		{
+			CreateViewModel();
+			viewModel.IsPartialView = true;
+			viewModel.IsContentPage = true;
+			bool enabled = viewModel.IsContentPagePropertiesEnabled;
+			
+			Assert.IsFalse(enabled);
+		}
+		
+		[Test]
+		public void IsPartialView_IsPartialViewChangedFromTrueToFalse_IsContentPagePropertiesEnabledPropertyChangedEventIsFired()
+		{
+			CreateViewModel();
+			viewModel.IsPartialView = true;
+			MonitorPropertyChangedEvents();
+			viewModel.IsPartialView = false;
+			SelectRazorViewEngine();
+			
+			bool fired = propertyChangedEvents.Contains("IsContentPagePropertiesEnabled");
+			
+			Assert.IsTrue(fired);
+		}
+		
+		[Test]
+		public void IsPartialView_IsContentPageChangedFromTrueToFalse_IsContentPagePropertiesEnabledPropertyChangedEventIsFired()
+		{
+			CreateViewModel();
+			viewModel.IsContentPage = true;
+			MonitorPropertyChangedEvents();
+			viewModel.IsContentPage = false;
+			SelectRazorViewEngine();
+			
+			bool fired = propertyChangedEvents.Contains("IsContentPagePropertiesEnabled");
+			
+			Assert.IsTrue(fired);
+		}
 	}
 }