diff --git a/website/public/js/directives/directives.js b/website/public/js/directives/directives.js
index d1543e348f..7b6d5c904a 100644
--- a/website/public/js/directives/directives.js
+++ b/website/public/js/directives/directives.js
@@ -177,7 +177,7 @@ habitrpg
         templateUrl: 'template/popover/popover-html.html'
     };
   }])
-  .directive( 'popoverHtml', [ '$compile', '$timeout', '$parse', '$window', '$tooltip', 
+  .directive( 'popoverHtml', [ '$compile', '$timeout', '$parse', '$window', '$tooltip',
     function ( $compile, $timeout, $parse, $window, $tooltip ) {
       return $tooltip( 'popoverHtml', 'popover', 'click' );
     }
@@ -193,3 +193,16 @@ habitrpg
       "  </div>\n" +
       "</div>\n");
   }]);
+
+habitrpg.directive('focusMe', function($timeout, $parse) {
+ return {
+   link: function(scope, element, attrs) {
+     var model = $parse(attrs.focusMe);
+     scope.$watch(model, function(value) {
+       $timeout(function() {
+         element[0].focus();
+       });
+     });
+   }
+ };
+});
diff --git a/website/views/shared/modals/members.jade b/website/views/shared/modals/members.jade
index dc46f4bb43..70b3fddd33 100644
--- a/website/views/shared/modals/members.jade
+++ b/website/views/shared/modals/members.jade
@@ -46,7 +46,7 @@ script(type='text/ng-template', id='modals/private-message.html')
   .modal-header
     h4=env.t('pmHeading', {name: "{{profile.profile.name}}"})
   .modal-body
-    textarea.form-control(type='text',rows='5',ui-keydown='{"meta-enter":"sendPrivateMessage(profile._id, _message)"}',ng-model='_message')
+    textarea.form-control(type='text',rows='5',ui-keydown='{"meta-enter":"sendPrivateMessage(profile._id, _message)"}',ng-model='_message', focus-me)
   .modal-footer
     button.btn.btn-primary(ng-click='sendPrivateMessage(profile._id, _message)')=env.t("send")
     button.btn.btn-default(ng-click='$close()')=env.t('cancel')
@@ -109,4 +109,4 @@ script(type='text/ng-template', id='modals/remove-member.html')
     textarea.form-control(type='text',rows='5',placeholder=env.t('optionalMessage'),ng-model='removeMemberData.message')
   .modal-footer
     button.pull-left.btn.btn-danger(ng-click='confirmRemoveMember(true); $close()')=env.t('yesRemove')
-    button.btn.btn-default(ng-click='confirmRemoveMember(false); $close()')=env.t('cancel')
\ No newline at end of file
+    button.btn.btn-default(ng-click='confirmRemoveMember(false); $close()')=env.t('cancel')