diff --git a/app/assets/javascripts/discourse/controllers/quote-button.js.es6 b/app/assets/javascripts/discourse/controllers/quote-button.js.es6
index c1ef10fdea7..76c6cb2e3a3 100644
--- a/app/assets/javascripts/discourse/controllers/quote-button.js.es6
+++ b/app/assets/javascripts/discourse/controllers/quote-button.js.es6
@@ -62,7 +62,9 @@ export default Ember.Controller.extend({
     markerElement.appendChild(document.createTextNode("\ufeff"));
 
     const isMobileDevice = this.site.isMobileDevice;
-    const isIOS = this.capabilities.isIOS;
+    const capabilities = this.capabilities,
+          isIOS = capabilities.isIOS,
+          isAndroid = capabilities.isAndroid;
 
     // collapse the range at the beginning/end of the selection
     range.collapse(!isMobileDevice);
@@ -86,7 +88,7 @@ export default Ember.Controller.extend({
       let topOff = markerOffset.top;
       let leftOff = markerOffset.left;
 
-      if (isMobileDevice || isIOS) {
+      if (isMobileDevice || isIOS || isAndroid) {
         topOff = topOff + 20;
         leftOff = Math.min(leftOff + 10, $(window).width() - $quoteButton.outerWidth());
       } else {