diff --git a/app/assets/javascripts/protocols/header.js b/app/assets/javascripts/protocols/header.js
index b1a1683d8..13f678e7d 100644
--- a/app/assets/javascripts/protocols/header.js
+++ b/app/assets/javascripts/protocols/header.js
@@ -22,8 +22,12 @@ var ProtocolRepositoryHeader = (function() {
 
   function initEditDescription() {
     var viewObject = $('#protocol_description_view');
-    viewObject.on('click', function() {
+    viewObject.on('click', function(e) {
+      if ($(e.target).hasClass('record-info-link')) return;
       TinyMCE.init('#protocol_description_textarea');
+    }).on('click', 'a', function(e) {
+      if ($(this).hasClass('record-info-link')) return;
+      e.stopPropagation();
     });
     TinyMCE.initIfHasDraft(viewObject);
   }
diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb
index 8dd6687e6..30a4a4cfb 100644
--- a/config/initializers/constants.rb
+++ b/config/initializers/constants.rb
@@ -318,7 +318,7 @@ class Constants
 
   WHITELISTED_ATTRIBUTES = [
     'href', 'src', 'width', 'height', 'alt', 'cite', 'datetime', 'title',
-    'class', 'name', 'xml:lang', 'abbr', 'style', 'target', :data, 'border'
+    'class', 'name', 'xml:lang', 'abbr', 'style', 'target', :data, 'border', 'contenteditable'
   ].freeze
 
   WHITELISTED_CSS_ATTRIBUTES = {