diff --git a/packages/rocketchat-ui-sidenav/client/toolbar.html b/packages/rocketchat-ui-sidenav/client/toolbar.html
index 2f244951746..356d752a678 100644
--- a/packages/rocketchat-ui-sidenav/client/toolbar.html
+++ b/packages/rocketchat-ui-sidenav/client/toolbar.html
@@ -19,7 +19,7 @@
 
 <template name="toolbarSearchList">
 	<i class="{{icon}} {{userStatus}}"></i>
-	<span class="room-title {{#if unread}}bold{{/if}}">{{displayName}}</span>
+	<span class="room-title {{#if unread}}bold{{/if}}" name="{{displayName}}" >{{displayName}}</span>
 	{{#if unread}}
 		<span class="unread">{{unread}}</span>
 	{{/if}}
diff --git a/tests/end-to-end/ui/04-main-elements-render.js b/tests/end-to-end/ui/04-main-elements-render.js
index 05d6089c416..c8b6fec1f2c 100644
--- a/tests/end-to-end/ui/04-main-elements-render.js
+++ b/tests/end-to-end/ui/04-main-elements-render.js
@@ -27,6 +27,7 @@ describe('[Main Elements Render]', function() {
 			});
 
 			it('it should show the new channel button', () => {
+				sideNav.newChannelBtn.waitForVisible(5000);
 				sideNav.newChannelBtn.isVisible().should.be.true;
 			});
 
diff --git a/tests/pageobjects/side-nav.page.js b/tests/pageobjects/side-nav.page.js
index 601ded7a870..d4dc1b88ff6 100644
--- a/tests/pageobjects/side-nav.page.js
+++ b/tests/pageobjects/side-nav.page.js
@@ -46,31 +46,47 @@ class SideNav extends Page {
 		browser.click(`.rooms-list > .wrapper > ul [title="${ channelName }"]`);
 		browser.waitForVisible('.input-message', 5000);
 		browser.waitUntil(function() {
-			browser.waitForVisible('.room-title', 5000);
-			return browser.getText('.room-title') === channelName;
-		}, 5000);
+			browser.waitForVisible('.fixed-title .room-title', 8000);
+			return browser.getText('.fixed-title .room-title') === channelName;
+		}, 10000);
 	}
 
 	// Opens a channel via spotlight search
 	searchChannel(channelName) {
-		this.spotlightSearch.waitForVisible(5000);
-		this.spotlightSearch.click();
-		this.spotlightSearch.setValue(channelName);
-		browser.waitForVisible(`.room-title=${ channelName }`, 10000);
-		browser.click(`.room-title=${ channelName }`);
-		browser.waitUntil(function() {
-			browser.waitForVisible('.room-title', 5000);
-			return browser.getText('.room-title') === channelName;
-		}, 5000);
+		browser.waitForVisible('.fixed-title .room-title', 5000);
+		const currentRoom = browser.element('.fixed-title .room-title').getText();
+		if (currentRoom !== channelName) {
+			this.spotlightSearch.waitForVisible(5000);
+			this.spotlightSearch.click();
+			this.spotlightSearch.setValue(channelName);
+			// const room = browser.selectByVisibleText('.search.room-title', channelName);
+			// room.waitForVisible(5000);
+			// room.click();
+			browser.waitForVisible(`[name='${ channelName }']`, 5000);
+			browser.click(`[name='${ channelName }']`);
+			browser.waitUntil(function() {
+				browser.waitForVisible('.fixed-title .room-title', 8000);
+				return browser.getText('.fixed-title .room-title') === channelName;
+			}, 10000);
+		}
 	}
 
 	// Gets a channel from the spotlight search
 	getChannelFromSpotlight(channelName) {
-		this.spotlightSearch.waitForVisible(5000);
-		this.spotlightSearch.click();
-		this.spotlightSearch.setValue(channelName);
-		browser.waitForVisible(`.room-title=${ channelName }`, 5000);
-		return browser.element(`.room-title=${ channelName }`);
+		browser.waitForVisible('.fixed-title .room-title', 5000);
+		const currentRoom = browser.element('.fixed-title .room-title').getText();
+		if (currentRoom !== channelName) {
+			this.spotlightSearch.waitForVisible(5000);
+			this.spotlightSearch.click();
+			this.spotlightSearch.setValue(channelName);
+			browser.waitForVisible(`[name='${ channelName }']`, 5000);
+			return browser.element(`[name='${ channelName }']`);
+			// const room = browser.selectByValue('.search.room-title', channelName);
+			// room.waitForVisible(5000);
+			// return room;
+			// return browser.element(`.room-title=${ channelName }`);
+
+		}
 	}
 
 	// Gets a channel from the rooms list