diff --git a/static/directives/global-message-tab.html b/static/directives/global-message-tab.html
index 50c6face6..0ec26aabf 100644
--- a/static/directives/global-message-tab.html
+++ b/static/directives/global-message-tab.html
@@ -19,7 +19,7 @@
         <td class="message-content">
           <span ng-switch on="message.media_type">
             <span ng-switch-when="text/markdown">
-                <span class="markdown-view" content="message.content"></span>
+              <markdown-view content="message.content"></markdown-view>
             </span>
             <span ng-switch-default>{{ message.content }}</span>
           </span>
@@ -81,7 +81,10 @@
               </select>
 
               <label>Message</label>
-              <div class="markdown-editor" content="newMessage.content"></div>
+              <markdown-input content="newMessage.content" 
+                              can-write="true" 
+                              (content-changed)="updateMessage($event.content)" 
+                              field-title="message"></markdown-input>
             </div>
           </div>
           <div class="modal-footer" ng-show="createdMessage">
diff --git a/static/directives/request-service-key-dialog.html b/static/directives/request-service-key-dialog.html
index 40ab659f4..27ba1ba13 100644
--- a/static/directives/request-service-key-dialog.html
+++ b/static/directives/request-service-key-dialog.html
@@ -76,7 +76,10 @@
                   <tr>
                     <td><label for="create-key-notes">Approval Notes (optional):</label></td>
                     <td>
-                      <div class="markdown-editor" content="preshared.notes"></div>
+                      <markdown-input content="preshared.notes" 
+                                      can-write="true" 
+                                      (content-changed)="updateNotes($event.content)" 
+                                      field-title="notes"></markdown-input>
                       <span class="co-help-text">
                         Optional notes for additional human-readable information about why the key was created.
                       </span>
diff --git a/static/directives/service-keys-manager.html b/static/directives/service-keys-manager.html
index 4f043861a..1935846dc 100644
--- a/static/directives/service-keys-manager.html
+++ b/static/directives/service-keys-manager.html
@@ -251,7 +251,10 @@
           <li ng-repeat="key in approveKeysInfo.keys">{{ getKeyTitle(key) }}</li>
         </ul>
       </div>
-      <div class="markdown-editor" content="approveKeysInfo.notes"></div>
+      <markdown-input content="approveKeysInfo.notes"
+                      can-write="true"
+                      (content-changed)="updateApproveKeysInfoNotes($event.content)"
+                      field-title="notes"></markdown-input>
       <span class="co-help-text">
         Enter optional notes for additional human-readable information about why the keys were approved.
       </span>
@@ -268,7 +271,10 @@
       <div style="margin-bottom: 10px;">
         Approve service key <strong>{{ getKeyTitle(approvalKeyInfo.key) }}</strong>?
       </div>
-      <div class="markdown-editor" content="approvalKeyInfo.notes"></div>
+      <markdown-input content="approvalKeysInfo.notes"
+                      can-write="true"
+                      (content-changed)="updateApprovalKeyInfoNotes($event.content)"
+                      field-title="notes"></markdown-input>
       <span class="co-help-text">
         Enter optional notes for additional human-readable information about why the key was approved.
       </span>
@@ -344,7 +350,10 @@
               <tr>
                 <td><label for="create-key-notes">Approval Notes:</label></td>
                 <td>
-                  <div class="markdown-editor" content="newKey.notes"></div>
+                  <markdown-input content="newKey.notes"
+                                  can-write="true"
+                                  (content-changed)="updateNewKeyNotes($event.content)"
+                                  field-title="notes"></markdown-input>
                   <span class="co-help-text">
                     Optional notes for additional human-readable information about why the key was added.
                   </span>
diff --git a/static/js/directives/ui/global-message-tab.js b/static/js/directives/ui/global-message-tab.js
index e0534cd2f..8f4ac572b 100644
--- a/static/js/directives/ui/global-message-tab.js
+++ b/static/js/directives/ui/global-message-tab.js
@@ -38,15 +38,15 @@ angular.module('quay').directive('globalMessageTab', function () {
 
         ApiService.createGlobalMessage(data, null).then(function (resp) {
           $scope.creatingMessage = false;
-          $scope.newMessage = {
-            'media_type': 'text/markdown',
-            'severity': 'info'
-          };
 
           $('#createMessageModal').modal('hide');
           $scope.loadMessageInternal();
         }, errorHandler)
       };
+      
+      $scope.updateMessage = function(content) {
+        $scope.newMessage.content = content;
+      };
 
       $scope.showDeleteMessage = function (uuid) {
         $scope.messageToDelete = uuid;
diff --git a/static/js/directives/ui/request-service-key-dialog.js b/static/js/directives/ui/request-service-key-dialog.js
index 9c0ed1320..bd3351567 100644
--- a/static/js/directives/ui/request-service-key-dialog.js
+++ b/static/js/directives/ui/request-service-key-dialog.js
@@ -108,6 +108,10 @@ angular.module('quay').directive('requestServiceKeyDialog', function () {
           $scope.keyCreated({'key': resp});
         }, ApiService.errorDisplay('Could not create service key'));
       };
+      
+      $scope.updateNotes = function(content) {
+        $scope.preshared.notes = content;
+      };
 
       $scope.$watch('requestKeyInfo', function(info) {
         if (info && info.service) {
diff --git a/static/js/directives/ui/search-box/search-box.component.html b/static/js/directives/ui/search-box/search-box.component.html
index 69495614a..48d756197 100644
--- a/static/js/directives/ui/search-box/search-box.component.html
+++ b/static/js/directives/ui/search-box/search-box.component.html
@@ -31,8 +31,11 @@
           <span class="avatar" data="result.namespace.avatar"  size="16"></span>
           <span class="result-name">{{ result.namespace.name }}/{{ result.name }}</span>
           <div class="result-description" ng-if="result.description">
-            <div class="description markdown-view" content="result.description"
-                 first-line-only="true" placeholder-needed="false"></div>
+            <div class="description">
+              <markdown-view content="result.description"
+                             first-line-only="true"
+                             placeholder-needed="false"></markdown-view>
+            </div>
           </div>
         </span>
         <span ng-switch-when="application">
diff --git a/static/js/directives/ui/service-keys-manager.js b/static/js/directives/ui/service-keys-manager.js
index 97a265194..d6a4da38f 100644
--- a/static/js/directives/ui/service-keys-manager.js
+++ b/static/js/directives/ui/service-keys-manager.js
@@ -168,6 +168,10 @@ angular.module('quay').directive('serviceKeysManager', function () {
           loadServiceKeys();
         }, ApiService.errorDisplay('Could not create service key'));
       };
+      
+      $scope.updateNewKeyNotes = function(content) {
+        $scope.newKey.notes = content;
+      };
 
       $scope.showApproveKey = function(key) {
         $scope.approvalKeyInfo = {
@@ -195,6 +199,10 @@ angular.module('quay').directive('serviceKeysManager', function () {
           callback(true);
         }, errorHandler);
       };
+      
+      $scope.updateApprovalKeyInfoNotes = function(content) {
+        $scope.approvalKeyInfo.notes = content;
+      };
 
       $scope.showCreateKey = function() {
         $scope.newKey = {
@@ -351,7 +359,11 @@ angular.module('quay').directive('serviceKeysManager', function () {
 
         forAllKeys(info.keys, 'Could not approve service key', performer, callback);
       };
-
+      
+      $scope.updateApproveKeysInfoNotes = function(content) {
+        $scope.approveKeysInfo.notes = content;
+      };
+      
       $scope.changeKeysExpiration = function(info, callback) {
         var performer = function(key) {
           var data = {