diff --git a/app/js/message_composer.js b/app/js/message_composer.js
index dd4e855f..23d8dac4 100644
--- a/app/js/message_composer.js
+++ b/app/js/message_composer.js
@@ -276,6 +276,7 @@ EmojiTooltip.prototype.updateTabContents = function (tab) {
     self.contentEl.html(html.join(''));
 
     if (!Config.Mobile) {
+      self.contentWrapEl.nanoScroller({scroll: 'top'});
       setTimeout(function () {
         self.contentWrapEl.nanoScroller();
       }, 100);