diff --git a/packages/rocketchat-theme/assets/stylesheets/base.less b/packages/rocketchat-theme/assets/stylesheets/base.less
index 60be1bcdda7..b90fb354947 100644
--- a/packages/rocketchat-theme/assets/stylesheets/base.less
+++ b/packages/rocketchat-theme/assets/stylesheets/base.less
@@ -1089,7 +1089,7 @@ label.required:after {
 		}
 		&.toggle {
 			font-size: 0;
-			> label {
+			> span {
 				display: inline-block;
 				width: calc(~"100% - 40px");
 				font-size: 14px;
diff --git a/packages/rocketchat-ui-sidenav/side-nav/createCombinedFlex.html b/packages/rocketchat-ui-sidenav/side-nav/createCombinedFlex.html
index de5b532d46f..145bbed5915 100644
--- a/packages/rocketchat-ui-sidenav/side-nav/createCombinedFlex.html
+++ b/packages/rocketchat-ui-sidenav/side-nav/createCombinedFlex.html
@@ -8,19 +8,19 @@
 		<div class="wrapper">
 			<h4>{{_ "Create_new" }}</h4>
 			<div class="input-line label-top">
-				<label for="channel-name">{{_ "Name"}}</label>
+				<span>{{_ "Name"}}</span>
 				<input type="text" id="channel-name" class="required" dir="auto" placeholder="{{_ 'Enter_name_here'}}">
 				<i class="icon-hash"></i>
 			</div>
 			<div class="input-line toggle">
-				<label for="channel-type">{{_ "Private"}}</label>
+				<span>{{_ "Private"}}</span>
 				<div class="input checkbox toggle">
 					<input type="checkbox" id="channel-type" {{privateSwitchDisabled}} {{privateSwitchChecked}}>
 					<label for="channel-type"></label>
 				</div>
 			</div>
 			<div class="input-line toggle">
-				<label for="channel-ro">{{_ "Read_only_channel"}}</label>
+				<span>{{_ "Read_only_channel"}}</span>
 				<div class="input checkbox toggle">
 					<input type="checkbox" id="channel-ro">
 					<label for="channel-ro"></label>
diff --git a/tests/pageobjects/side-nav.page.js b/tests/pageobjects/side-nav.page.js
index c73326b0a60..2db6452889a 100644
--- a/tests/pageobjects/side-nav.page.js
+++ b/tests/pageobjects/side-nav.page.js
@@ -4,8 +4,8 @@ class SideNav extends Page {
 	get directMessageTarget() { return browser.element('.flex-nav input#who'); }
 	get saveDirectMessageBtn() { return browser.element('.save-direct-message'); }
 
-	get channelType() { return browser.element('#channel-type'); }
-	get channelReadOnly() { return browser.element('#channel-ro'); }
+	get channelType() { return browser.element('label[for="channel-type"]'); }
+	get channelReadOnly() { return browser.element('label[for="channel-ro"]'); }
 	get channelName() { return browser.element('#channel-name'); }
 	get saveChannelBtn() { return browser.element('.save-channel'); }