diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js.es6 b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
index 83b7d2abc5f..ca7e88b207f 100644
--- a/app/assets/javascripts/discourse/components/emoji-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
@@ -220,11 +220,11 @@ export default Ember.Component.extend({
 
   _bindResizing() {
     this.$(window).on("resize", () => {
-      Ember.run.debounce(this, this._positionPicker, 100);
+      Ember.run.throttle(this, this._positionPicker, 50);
     });
 
-    Ember.$("#reply-control").on("div-resized", () => {
-      Ember.run.debounce(this, this._positionPicker, 100);
+    Ember.$("#reply-control").on("div-resizing", () => {
+      Ember.run.throttle(this, this._positionPicker, 50);
     });
   },
 
diff --git a/vendor/assets/javascripts/div_resizer.js b/vendor/assets/javascripts/div_resizer.js
index 66ddfe9585b..9bb7b3ccc20 100644
--- a/vendor/assets/javascripts/div_resizer.js
+++ b/vendor/assets/javascripts/div_resizer.js
@@ -38,6 +38,8 @@ startDrag = function(e, opts) {
 };
 
 performDrag = function(e, opts) {
+  $(div).trigger("div-resizing");
+
   var size, sizePx, thisMousePos;
   thisMousePos = mousePosition(e).y;
   size = originalDivHeight + (originalPos - thisMousePos);