diff --git a/app/assets/javascripts/discourse/views/quote-button.js.es6 b/app/assets/javascripts/discourse/views/quote-button.js.es6
index dad4b4d79eb..e8e1dac4af6 100644
--- a/app/assets/javascripts/discourse/views/quote-button.js.es6
+++ b/app/assets/javascripts/discourse/views/quote-button.js.es6
@@ -50,7 +50,9 @@ export default Discourse.View.extend({
 
         // deselects only when the user left click
         // (allows anyone to `extend` their selection using shift+click)
-        if (e.which === 1 && !e.shiftKey) controller.deselectText();
+        if (!window.getSelection().isCollapsed &&
+            e.which === 1 &&
+            !e.shiftKey) controller.deselectText();
       })
       .on('mouseup.quote-button', function(e) {
         view.selectText(e.target, controller);