diff --git a/src/skins/vector/css/common.css b/src/skins/vector/css/common.css
index 1e6db6939e..2b6e02ed37 100644
--- a/src/skins/vector/css/common.css
+++ b/src/skins/vector/css/common.css
@@ -52,6 +52,12 @@ a:visited {
     color: #76cfa6;
 }
 
+input[type=text]:focus, textarea:focus, .mx_RoomSettings textarea:focus {
+    border: 1px solid #76CFA6;
+    outline: none;
+    box-shadow: none;
+}
+
 /* XXX: critical hack to GeminiScrollbar to allow them to work in FF 42 and Chrome 48.
    Stop the scrollbar view from pushing out the container's overall sizing, which causes
    flexbox to adapt to the new size and cause the view to keep growing.
diff --git a/src/skins/vector/css/molecules/SearchBar.css b/src/skins/vector/css/molecules/SearchBar.css
index 71bc02f58f..ba1de56c5a 100644
--- a/src/skins/vector/css/molecules/SearchBar.css
+++ b/src/skins/vector/css/molecules/SearchBar.css
@@ -23,7 +23,7 @@ limitations under the License.
 
 .mx_SearchBar_input {
     display: inline block;
-    border-radius: 3px;
+    border-radius: 3px 0px 0px 3px;
     border: 1px solid #f0f0f0;
     font-size: 15px;
     padding: 9px;
@@ -35,6 +35,7 @@ limitations under the License.
 .mx_SearchBar_searchButton {
     cursor: pointer;
     margin-right: 10px;
+    border-radius: 0px 3px 3px 0px;
 }
 
 .mx_SearchBar_button {