Merge branch 'fix' into 171-cannot-choose-between-messages-and-chats-in-the-search-field

fairchat/qml/navigation/TopBar.qml

@@ -305,6 +305,7 @@ Item {
                         prevText = text
                         hideSearchField()
                         messageSearchModel.clear()
+                        roomSearchModel.clear()
                         focus = false
                     }
 
@@ -359,9 +360,9 @@ Item {
                     onActiveFocusChanged: {
                         if(activeFocus){
                             showSearchField()
-                        }else if(text == ""){
+                        }/*else if(text == ""){
                             resetSearchField()
-                        }
+                        }*/
                     }
 
                     onAccepted: {