diff --git a/cms/static/js/base.js b/cms/static/js/base.js
index 8ad8bb7a8f..dcc172210c 100644
--- a/cms/static/js/base.js
+++ b/cms/static/js/base.js
@@ -63,7 +63,6 @@ $(document).ready(function() {
     // add/remove policy metadata button click handlers
     $('.add-policy-data').bind('click', addPolicyMetadata);
     $('.remove-policy-data').bind('click', removePolicyMetadata);
-    $body.on('click', '.edit-policy-data', editPolicyMetadata);
     $body.on('click', '.policy-list-element .save-button', savePolicyMetadata);
     $body.on('click', '.policy-list-element .cancel-button', cancelPolicyMetadata);
 
@@ -172,7 +171,6 @@ function editPolicyMetadata(e) {
     var $policyElement = $(this).parents('.policy-list-element');
     $policyElement.data('currentValues', [$policyElement.find('.policy-list-name').val(), $policyElement.find('.policy-list-value').val()]);
     $policyElement.addClass('new-policy-list-element').addClass('editing');
-    $policyElement.find('.policy-list-name, .policy-list-value').removeAttr('disabled');
 }
 
 function savePolicyMetadata(e) {
@@ -182,7 +180,6 @@ function savePolicyMetadata(e) {
     $('.save-subsection').click();
     $policyElement.removeClass('new-policy-list-element');
     $policyElement.find('.policy-list-name').attr('disabled', 'disabled');
-    $policyElement.find('.policy-list-value').attr('disabled', 'disabled');
     $policyElement.removeClass('editing');
 }
 
diff --git a/cms/static/sass/_subsection.scss b/cms/static/sass/_subsection.scss
index 23dae7e353..0d7d518ffd 100644
--- a/cms/static/sass/_subsection.scss
+++ b/cms/static/sass/_subsection.scss
@@ -22,8 +22,7 @@
 	}
 
 	.policy-list {
-		.policy-list-name,
-		.policy-list-value {
+		input[disabled] {
 			border: none;
 			@include box-shadow(none);
 		}
diff --git a/cms/templates/edit_subsection.html b/cms/templates/edit_subsection.html
index d86f65f9c4..b3e4031822 100644
--- a/cms/templates/edit_subsection.html
+++ b/cms/templates/edit_subsection.html
@@ -36,10 +36,9 @@
           <ol class='policy-list'>
               % for policy_name in policy_metadata.keys():
               <li class="policy-list-element">
-                  <input type="text" class="policy-list-name" name="${policy_name}" value="${policy_name}" disabled size="15"/>:&nbsp;<input type="text" class="policy-list-value" name="${policy_metadata[policy_name]}" value="${policy_metadata[policy_name]}" disabled size="40"/>
+                  <input type="text" class="policy-list-name" name="${policy_name}" value="${policy_name}" disabled size="15"/>:&nbsp;<input type="text" class="policy-list-value" name="${policy_metadata[policy_name]}" value="${policy_metadata[policy_name]}" size="40"/>
                   <a href="#" class="save-button">Save</a>
                   <a href="#" class="cancel-button">Cancel</a>
-                  <a href="#" class="edit-icon edit-policy-data"></a>
                   <a href="#" class="delete-icon remove-policy-data"></a>
               </li>
               % endfor
@@ -59,7 +58,6 @@
              <input type="text" class="policy-list-name" autocomplete="off" size="15"/>:&nbsp;<input type="text" class="policy-list-value" size=40 autocomplete="off"/>
              <a href="#" class="save-button">Save</a>
              <a href="#" class="cancel-button">Cancel</a>
-             <a href="#" class="edit-icon edit-policy-data"></a>
              <a href="#" class="delete-icon remove-policy-data"></a>
            </li>       
     </div>