diff --git a/static/js/click_handlers.js b/static/js/click_handlers.js
index ffe8036dff..0768fc0f4b 100644
--- a/static/js/click_handlers.js
+++ b/static/js/click_handlers.js
@@ -137,6 +137,11 @@ export function initialize() {
             return true;
         }
 
+        // Don't select message on clicking message control buttons.
+        if (target.parents(".message_controls").length > 0) {
+            return true;
+        }
+
         return false;
     }