diff --git a/webapp/languages/es_GO/i18n/all_es_GO.properties b/webapp/languages/es_GO/i18n/all_es_GO.properties
index 530451745..8322da845 100644
--- a/webapp/languages/es_GO/i18n/all_es_GO.properties
+++ b/webapp/languages/es_GO/i18n/all_es_GO.properties
@@ -884,4 +884,6 @@ base_property_capitalized = Base propiedad
 faux_property_capitalized = Faux propiedad
 faux_property_listing = Lista de faux propiedades
 faux_property_by_base = Faux propiedades por base propriedad
-faux_property_alpha = Faux propiedades en orden alfabético
\ No newline at end of file
+faux_property_alpha = Faux propiedades en orden alfabético
+
+no_class_restrictions=No hay clases con una restricción de esta propiedad.
\ No newline at end of file
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsController.java
index 19e7d4836..81c9cb835 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsController.java
@@ -46,10 +46,18 @@ public class ListVClassWebappsController extends FreemarkerHttpServlet {
 
         body.put("displayOption", "all");
         body.put("pageTitle", "All Classes");
+		body.put("propertyURI", vreq.getParameter("propertyURI"));
+		if ( vreq.getParameter("propertyType").equals("object") ) {
+			body.put("editController", "propertyEdit?uri=");
+		}
+		else {
+			body.put("editController", "datapropEdit?uri=");
+		}
         
         List<VClass> classes = null;
 
         if (vreq.getParameter("showPropertyRestrictions") != null) {
+			body.put("propertyName", vreq.getParameter("propertyName"));
         	PropertyDao pdao = vreq.getLanguageNeutralWebappDaoFactory().getObjectPropertyDao();
         	classes = pdao.getClassesWithRestrictionOnProperty(vreq.getParameter("propertyURI"));
         } else {
diff --git a/webapp/web/i18n/all.properties b/webapp/web/i18n/all.properties
index 3242af929..afc5ab4f4 100644
--- a/webapp/web/i18n/all.properties
+++ b/webapp/web/i18n/all.properties
@@ -897,4 +897,6 @@ base_property_capitalized = Base Property
 faux_property_capitalized = Faux Property
 faux_property_listing = Faux Property Listing
 faux_property_by_base = faux properties by base property
-faux_property_alpha = faux properties alphabetically
\ No newline at end of file
+faux_property_alpha = faux properties alphabetically
+
+no_class_restrictions=There are no classes with a restriction on this property.
\ No newline at end of file
diff --git a/webapp/web/templates/edit/specific/dataprops_edit.jsp b/webapp/web/templates/edit/specific/dataprops_edit.jsp
index 7aa5cdfb7..014697b7f 100644
--- a/webapp/web/templates/edit/specific/dataprops_edit.jsp
+++ b/webapp/web/templates/edit/specific/dataprops_edit.jsp
@@ -32,6 +32,8 @@
 	    <form action="listVClassWebapps" method="get">
 			<input type="hidden" name="showPropertyRestrictions" value="true"/>
 			<input type="hidden" name="propertyURI" value="${datatypeProperty.URI}"/>
+			<input type="hidden" name="propertyName" value="${datatypeProperty.publicName}"/>
+			<input type="hidden" name="propertyType" value="data"/>
 			<input type="submit" class="form-button" value="Show Classes With a Restriction on This Property"/>
 		</form>		
         <form action="listDataPropertyStatements" method="get">
diff --git a/webapp/web/templates/edit/specific/props_edit.jsp b/webapp/web/templates/edit/specific/props_edit.jsp
index dc9cc1905..e493d28c1 100644
--- a/webapp/web/templates/edit/specific/props_edit.jsp
+++ b/webapp/web/templates/edit/specific/props_edit.jsp
@@ -41,6 +41,8 @@
         <form action="listVClassWebapps" method="get">
 			<input type="hidden" name="showPropertyRestrictions" value="true"/>
 			<input type="hidden" name="propertyURI" value="${property.URI}"/>
+			<input type="hidden" name="propertyName" value="${property.domainPublic}"/>
+			<input type="hidden" name="propertyType" value="object"/>
 			<input type="submit" class="form-button" value="Show Classes With a Restriction on This Property"/>
 		</form>
         <form action="listObjectPropertyStatements" method="get">
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-classHierarchy.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-classHierarchy.ftl
index 56883e51e..123322d67 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-classHierarchy.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-classHierarchy.ftl
@@ -1,35 +1,41 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
 <section role="region">
-    
-    <h2>${pageTitle!}</h2>
-
-    <#if !displayOption?has_content>
-        <#assign displayOption = "asserted">
-    </#if>
-    <form name="classHierarchyForm" id="classHierarchyForm" action="showClassHierarchy" method="post" role="classHierarchy">
-        <label id="displayOptionLabel" class="inline">${i18n().display_options}</label>
-        <select id="displayOption" name="displayOption">
-            <option value="asserted" <#if displayOption == "asserted">selected</#if> >${i18n().asserted_class_hierarchy}</option>
-            <option  value="inferred" <#if displayOption == "inferred">selected</#if> >${i18n().inferred_class_hierarchy}</option>
-            <option value="all" <#if displayOption == "all">selected</#if> >${i18n().all_classes}</option>
-            <option value="group" <#if displayOption == "group">selected</#if> >${i18n().classes_by_classgroup}</option>
-        </select>
-        <input id="addClass" value="${i18n().add_new_classes}" class="form-button" type="submit" />
-        <#if displayOption == "group">
-                <input type="submit" id="addGroup" class="form-button" value="${i18n().add_new_group}"/>
-        </#if>
-    </form>
-        
-    <#if displayOption == "group">
-        <div id="expandLink"><span id="expandAll" ><a href="javascript:" title="${i18n().hide_show_subclasses}">${i18n().hide_subclasses}</a></span></div>
-    <#else>
-        <div id="expandLink"><span id="expandAll" ><a href="#" title="${i18n().expand_all}">${i18n().expand_all}</a></span></div>
-    </#if>
+	<#if propertyName?? >
+		<h2>Classes with a restriction on <em><a href="${editController}${propertyURI?url}">${propertyName!}</a></em></h2>
+		<br/>
+	<#else>
+    	<h2>${pageTitle!}</h2>
+    	
+    	<#if !displayOption?has_content>
+    	    <#assign displayOption = "asserted">
+    	</#if>
+    	<form name="classHierarchyForm" id="classHierarchyForm" action="showClassHierarchy" method="post" role="classHierarchy">
+    	    <label id="displayOptionLabel" class="inline">${i18n().display_options}</label>
+    	    <select id="displayOption" name="displayOption">
+    	        <option value="asserted" <#if displayOption == "asserted">selected</#if> >${i18n().asserted_class_hierarchy}</option>
+    	        <option  value="inferred" <#if displayOption == "inferred">selected</#if> >${i18n().inferred_class_hierarchy}</option>
+    	        <option value="all" <#if displayOption == "all">selected</#if> >${i18n().all_classes}</option>
+    	        <option value="group" <#if displayOption == "group">selected</#if> >${i18n().classes_by_classgroup}</option>
+    	    </select>
+    	    <input id="addClass" value="${i18n().add_new_classes}" class="form-button" type="submit" />
+    	    <#if displayOption == "group">
+    	            <input type="submit" id="addGroup" class="form-button" value="${i18n().add_new_group}"/>
+    	    </#if>
+    	</form>
+    	    
+    	<#if displayOption == "group">
+    	    <div id="expandLink"><span id="expandAll" ><a href="javascript:" title="${i18n().hide_show_subclasses}">${i18n().hide_subclasses}</a></span></div>
+    	<#else>
+    	    <div id="expandLink"><span id="expandAll" ><a href="#" title="${i18n().expand_all}">${i18n().expand_all}</a></span></div>
+    	</#if>
+	</#if>
     <section id="container">
-
+		<#if propertyName?? && !jsonTree?? >
+			${i18n().no_class_restrictions}
+		</#if>
     </section>
-</section>
+</se	ction>
 <script language="javascript" type="text/javascript" >
     var json = [${jsonTree!}];
     var i18nStrings = {