diff --git a/src/components/views/rooms/RoomTooltip.js b/src/components/views/rooms/RoomTooltip.js
index fbe2fa56a5..2f5de83721 100644
--- a/src/components/views/rooms/RoomTooltip.js
+++ b/src/components/views/rooms/RoomTooltip.js
@@ -34,7 +34,7 @@ module.exports = React.createClass({
             });
         }
         else {
-            tooltip.style.top = tooltip.parentElement.getBoundingClientRect().top + "px";
+            tooltip.style.top = (70 + tooltip.parentElement.getBoundingClientRect().top) + "px";
             tooltip.style.display = "block";
         }
     },
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/SearchBox.css b/src/skins/vector/css/matrix-react-sdk/structures/SearchBox.css
index badf33da98..93e6d7c8e8 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/SearchBox.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/SearchBox.css
@@ -18,8 +18,8 @@ limitations under the License.
     height: 24px;
     margin-left: 16px;
     margin-right: 20px;
-    padding-top: 26px;
-    padding-bottom: 24px;
+    padding-top: 24px;
+    padding-bottom: 22px;
     border-bottom: 1px solid rgba(0, 0, 0, 0.1);
 
     display: flex;