diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js.es6 b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
index 800abdadf41..8b2f74371d0 100644
--- a/app/assets/javascripts/discourse/components/emoji-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
@@ -332,9 +332,9 @@ export default Ember.Component.extend({
 
       $picker.css({
         width: this.site.isMobileDevice ? this.$(window).width() - 10 : 340,
-        marginLeft: this.site.isMobileDevice ? -(this.$(window).width() - 10)/2 : -170,
-        marginTop: this.site.isMobileDevice ? 10 : -150,
-        left: "50%",
+        marginLeft: this.site.isMobileDevice ? 5 : -170,
+        marginTop: this.site.isMobileDevice ? 5 : -150,
+        left: this.site.isMobileDevice ? 0 : "50%",
         top: this.site.isMobileDevice ? 0 : "50%"
       });
     } else {