diff --git a/bundles/org.eclipse.jst.jsp.ui/plugin.xml b/bundles/org.eclipse.jst.jsp.ui/plugin.xml
index b83e9f0..2f9eba0 100644
--- a/bundles/org.eclipse.jst.jsp.ui/plugin.xml
+++ b/bundles/org.eclipse.jst.jsp.ui/plugin.xml
@@ -653,8 +653,6 @@
 	<extension point="org.eclipse.ui.propertyPages">
 		<!-- for j2ee web project -->
 		<page
-			objectClass="org.eclipse.core.resources.IProject"
-			adaptable="true"
 			name="%JSPFragmentContentSettings.name"
 			class="org.eclipse.jst.jsp.ui.internal.contentproperties.ui.ProjectJSPFContentSettingsPropertyPage"
 			id="org.eclipse.jst.jsp.ui.internal.contentproperties.ProjectJSPFContentSettingsPropertyPage">
@@ -672,8 +670,6 @@
 			</enabledWhen>
 		</page>
 		<page
-			objectClass="org.eclipse.core.resources.IFile"
-			adaptable="true"
 			name="%JSPFragmentContentSettings.name"
 			class="org.eclipse.jst.jsp.ui.internal.contentproperties.ui.JSPFContentSettingsPropertyPage"
 			id="org.eclipse.jst.jsp.ui.internal.contentproperties.JSPFContentSettingsPropertyPage">
diff --git a/bundles/org.eclipse.wst.css.ui/plugin.xml b/bundles/org.eclipse.wst.css.ui/plugin.xml
index 33a3b1a..a8b1a12 100644
--- a/bundles/org.eclipse.wst.css.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.css.ui/plugin.xml
@@ -84,15 +84,21 @@
 	<!-- CSS Content Settings Property Page -->
 	<extension point="org.eclipse.ui.propertyPages">
 		<page
-			objectClass="org.eclipse.core.resources.IFile"
-			adaptable="true"
 			name="%WebContentSettings.name"
 			class="org.eclipse.wst.css.ui.internal.contentproperties.ui.CSSWebContentSettingsPropertyPage"
 			id="org.eclipse.wst.css.ui.internal.contentproperties.CSSWebContentSettingsPropertyPage.css">
-			<filter
-				name="contentTypeId"
-				value="org.eclipse.wst.css.core.csssource">
-			</filter>
+         	<enabledWhen>
+               	<and>
+					<adapt type="org.eclipse.core.resources.IFile">
+						<or> 
+							<test 
+								forcePluginActivation="true"
+								property="org.eclipse.core.resources.contentTypeId"
+								value="org.eclipse.wst.css.core.csssource" />
+						</or>
+					</adapt>
+				</and> 
+			</enabledWhen>
 		</page>
 	</extension>
 
diff --git a/bundles/org.eclipse.wst.html.ui/plugin.xml b/bundles/org.eclipse.wst.html.ui/plugin.xml
index 3d4a908..be8421b 100644
--- a/bundles/org.eclipse.wst.html.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.html.ui/plugin.xml
@@ -91,8 +91,6 @@
 	<extension point="org.eclipse.ui.propertyPages">
 		<!-- for j2ee web project -->
 		<page
-			objectClass="org.eclipse.core.resources.IProject"
-			adaptable="true"
 			name="%WebContentSettings.name"
 			class="org.eclipse.wst.html.ui.internal.contentproperties.ui.ProjectWebContentSettingsPropertyPage"
 			id="org.eclipse.wst.html.ui.dynamicprojectpropertypage">
@@ -114,8 +112,6 @@
 			</enabledWhen>
 		</page>
 		<page
-			objectClass="org.eclipse.core.resources.IFile"
-			adaptable="true"
 			name="%WebContentSettings.name"
 			class="org.eclipse.wst.html.ui.internal.contentproperties.ui.WebContentSettingsPropertyPage"
 			id="org.eclipse.wst.html.ui.internal.contentproperties.ui.WebContentSettingsPropertyPage">
diff --git a/bundles/org.eclipse.wst.sse.ui/plugin.xml b/bundles/org.eclipse.wst.sse.ui/plugin.xml
index 52419e4..9350b6a 100644
--- a/bundles/org.eclipse.wst.sse.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.sse.ui/plugin.xml
@@ -94,9 +94,14 @@
 		<page
 			id="org.eclipse.wst.sse.ui.project.properties.tasktags"
 			name="%Task_Tags_Preferences.name"
-			objectClass="org.eclipse.core.resources.IProject"
-			adaptable="true"
-			class="org.eclipse.wst.sse.ui.internal.preferences.ui.TaskTagPreferencePage" />
+			class="org.eclipse.wst.sse.ui.internal.preferences.ui.TaskTagPreferencePage">
+         	<enabledWhen>
+               	<and>
+					<adapt type="org.eclipse.core.resources.IProject">
+					</adapt>
+				</and> 
+			</enabledWhen>
+		</page>
 	</extension>
 
 	<!--