diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js.es6 b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
index 08d54417582..6cbdafe7941 100644
--- a/app/assets/javascripts/discourse/components/emoji-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
@@ -21,6 +21,8 @@ export function resetCache() {
 let $picker, $filter, $results, $list, scrollPosition, $visibleSections, _checkTimeout;
 
 export default Ember.Component.extend({
+  automaticPositioning: true,
+
   willDestroyElement() {
     this._super();
 
@@ -448,7 +450,7 @@ export default Ember.Component.extend({
       $picker.css(_.merge(attributes, options));
     };
 
-    if(Ember.testing) {
+    if(Ember.testing || this.get("automaticPositioning") === false) {
       desktopPositioning();
       return;
     }