From c807776f2e9a16eb1f90a1305b696bcf87623acb Mon Sep 17 00:00:00 2001
From: Karl Prieb <karl@prieb.me>
Date: Fri, 25 Aug 2017 01:46:04 -0300
Subject: [PATCH] Fix search results position

---
 .../client/imports/components/sidebar/rooms-list.css           | 2 +-
 packages/rocketchat-ui-message/client/popup/messagePopup.html  | 2 +-
 packages/rocketchat-ui-message/client/popup/messagePopup.js    | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css b/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
index 5e940cc37e5a..ea7a770e1f5a 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/rooms-list.css
@@ -31,7 +31,7 @@
 	&__toolbar-search {
 		position: absolute;
 		z-index: 1;
-		top: var(--sidebar-header-height);
+
 		left: 0;
 
 		overflow-y: auto;
diff --git a/packages/rocketchat-ui-message/client/popup/messagePopup.html b/packages/rocketchat-ui-message/client/popup/messagePopup.html
index aed6f003e273..791dba7ce875 100644
--- a/packages/rocketchat-ui-message/client/popup/messagePopup.html
+++ b/packages/rocketchat-ui-message/client/popup/messagePopup.html
@@ -1,7 +1,7 @@
 <template name="messagePopup">
 	{{#if isOpen}}
 		{{#if sidebar}}
-			<ul class="rooms-list__list rooms-list__toolbar-search">
+			<ul class="rooms-list__list rooms-list__toolbar-search" style="top: {{sidebarHeaderHeight}}">
 				{{#each data}}
 						{{> Template.dynamic template=../template data=toolbarData }}
 				{{/each}}
diff --git a/packages/rocketchat-ui-message/client/popup/messagePopup.js b/packages/rocketchat-ui-message/client/popup/messagePopup.js
index 420d2224e61f..9b0726b89042 100644
--- a/packages/rocketchat-ui-message/client/popup/messagePopup.js
+++ b/packages/rocketchat-ui-message/client/popup/messagePopup.js
@@ -284,5 +284,8 @@ Template.messagePopup.helpers({
 	},
 	toolbarData() {
 		return {...Template.currentData(), toolbar: true};
+	},
+	sidebarHeaderHeight() {
+		return `${ document.querySelector('.sidebar__header').offsetHeight }px`;
 	}
 });