From ddd12edc064bdd81fffbad941e199eaa065e3ae0 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 20 Apr 2017 14:21:36 +0100
Subject: [PATCH] clear the searchbox after quick-search

---
 src/components/structures/RoomSubList.js | 3 ++-
 src/components/structures/SearchBox.js   | 6 +-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index d501202a12..88630891e1 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -164,10 +164,11 @@ var RoomSubList = React.createClass({
         }
     },
 
-    onRoomTileClick(roomId) {
+    onRoomTileClick(roomId, ev) {
         dis.dispatch({
             action: 'view_room',
             room_id: roomId,
+            clear_search: (ev && (ev.keyCode == 13 || ev.keyCode == 32)),
         });
     },
 
diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js
index a3848dcc44..d79617c046 100644
--- a/src/components/structures/SearchBox.js
+++ b/src/components/structures/SearchBox.js
@@ -48,18 +48,14 @@ module.exports = React.createClass({
     },
 
     onAction: function(payload) {
-        // Disabling this as I find it really really annoying, and was used to the
-        // previous behaviour - see https://github.com/vector-im/riot-web/issues/3348
-/*        
         switch (payload.action) {
             // Clear up the text field when a room is selected.
             case 'view_room':
-                if (this.refs.search) {
+                if (payload.clear_search && this.refs.search) {
                     this._clearSearch();
                 }
                 break;
         }
-*/        
     },
 
     onChange: function() {