diff --git a/modules/about/client/less/about.less b/modules/about/client/less/about.less
index 8b5c581a..88650e6f 100644
--- a/modules/about/client/less/about.less
+++ b/modules/about/client/less/about.less
@@ -177,7 +177,6 @@
             }
             textarea {
                 resize: vertical;
-                margin-top: 20px;
                 width: 100%;
                 min-height: 200px;
             }
diff --git a/modules/messages/client/less/message.less b/modules/messages/client/less/message.less
index a52d527f..6035eaa3 100644
--- a/modules/messages/client/less/message.less
+++ b/modules/messages/client/less/message.less
@@ -152,4 +152,9 @@
 .textcomplete-dropup {
     top: auto !important;
     bottom: 160px !important;
+    z-index: 1010 !important;
+}
+
+.textcomplete-dropdown {
+    z-index: 1010 !important;
 }
\ No newline at end of file
diff --git a/modules/users/client/controllers/admin/user.client.controller.js b/modules/users/client/controllers/admin/user.client.controller.js
index 480e715f..6ffa4f8a 100644
--- a/modules/users/client/controllers/admin/user.client.controller.js
+++ b/modules/users/client/controllers/admin/user.client.controller.js
@@ -199,6 +199,55 @@
       SideOverlay.close(null, 'makerSlide');
     };
 
+    /**
+     * initDescComplete
+     */
+    vm.initDescComplete = function () {
+      $('.desc-textarea').textcomplete([
+        { // emoji strategy
+          match: /\B:([\-+\w]*)$/,
+          search: function (term, callback) {
+            callback($.map(window.emojies, function (emoji) {
+              return emoji.indexOf(term) === 0 ? emoji : null;
+            }));
+          },
+          template: function (value) {
+            return '<img class="ac-emoji" src="/graphics/emojis/' + value + '.png" />' + '<span class="ac-emoji-text">' + value + '</span>';
+          },
+          replace: function (value) {
+            return ':' + value + ': ';
+          },
+          index: 1
+        }
+      ]);
+    };
+
+    /**
+     * onDescKeyDown
+     * @param e
+     */
+    vm.onDescKeyDown = function (e) {
+      if (e.keyCode === 27) { // ESC
+        var hasPopupMenu = false;
+        var emojiMenu = $('.textcomplete-dropdown');
+        angular.forEach(emojiMenu, function (e) {
+          if (e.style.display === 'block') {
+            hasPopupMenu = true;
+          }
+        });
+        if (hasPopupMenu) {
+          e.stopPropagation();
+        }
+      }
+    };
+
+    /**
+     * onPopupMessageOpen
+     */
+    vm.onPopupMessageOpen = function () {
+      $('#maker-name').focus();
+    };
+
     /**
      * createMakerGroup
      */
diff --git a/modules/users/client/views/admin/view-user.client.view.html b/modules/users/client/views/admin/view-user.client.view.html
index 8f912fef..9c4b79e4 100644
--- a/modules/users/client/views/admin/view-user.client.view.html
+++ b/modules/users/client/views/admin/view-user.client.view.html
@@ -253,16 +253,18 @@
         </div>
     </div>
 
-    <div id="makerSlide" side-overlay="right" side-class="maker-side-overlay" side-close-on-esc side-modal>
-        <div class="maker-popup">
+    <div id="makerSlide" side-overlay="right" side-class="maker-side-overlay" side-opened="vm.onPopupMessageOpen();" side-close-on-esc side-modal>
+        <div class="maker-popup" ng-init="vm.initDescComplete();">
             <h4 translate="ABOUT.FORM_MAKER_FOR" translate-values="{name: vm.user.displayName}"></h4>
 
             <div class="maker-form">
-                <input type="text" class="form-control" id="name" placeholder="{{'ABOUT.FORM_MAKER_NAME' | translate}}"
+                <input type="text" class="form-control margin-bottom-10" id="maker-name" placeholder="{{'ABOUT.FORM_MAKER_NAME' | translate}}"
                        ng-model="vm.maker.name" autofocus>
 
-                <textarea class="form-control" id="desc" placeholder="{{'ABOUT.FORM_MAKER_DESC' | translate}}"
-                          ng-model="vm.maker.desc"></textarea>
+                <textarea class="form-control desc-textarea" id="desc-textarea" name="desc-textarea"
+                          ng-model="vm.maker.desc" data-hidden-buttons="cmdPreview" ng-keydown="vm.onDescKeyDown($event);"
+                          placeholder="{{'ABOUT.FORM_MAKER_DESC' | translate}}"
+                          mt-markdown-editor="desc-textarea"></textarea>
 
                 <div class="margin-top-10" style="display: table;">
                     <a class="message-extra" href="https://guides.github.com/features/mastering-markdown/" target="_blank"