diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js
index fb5beab1cd..a3848dcc44 100644
--- a/src/components/structures/SearchBox.js
+++ b/src/components/structures/SearchBox.js
@@ -108,6 +108,7 @@ module.exports = React.createClass({
                 if (ctrlCmdOnly) {
                     if (this.refs.search) {
                         this.refs.search.focus();
+                        this.refs.search.select();
                     }
                     handled = true;
                 }