diff --git a/packages/rocketchat-ui/client/views/app/createChannel.html b/packages/rocketchat-ui/client/views/app/createChannel.html
index 10c57c1efb4..a15f052222b 100644
--- a/packages/rocketchat-ui/client/views/app/createChannel.html
+++ b/packages/rocketchat-ui/client/views/app/createChannel.html
@@ -60,7 +60,7 @@
 					</label>
 				</div>
 			</div>
-			<button class="rc-button rc-button--blue" {{createIsDisabled}}>Create Channel</button>
+			<button class="rc-button rc-button--blue" data-button="create" {{createIsDisabled}}>Create Channel</button>
 		</div>
 	</section>
 </template>
diff --git a/packages/rocketchat-ui/client/views/app/createChannel.js b/packages/rocketchat-ui/client/views/app/createChannel.js
index 4937ff0cd8a..6875f5a5b19 100644
--- a/packages/rocketchat-ui/client/views/app/createChannel.js
+++ b/packages/rocketchat-ui/client/views/app/createChannel.js
@@ -1,9 +1,19 @@
 Template.createChannel.helpers({
 	createIsDisabled() {
-		if (document.getElementById('create-channel-input').value === '') {
+		if (Template.instance().channelName.get() === '') {
 			return 'disabled';
 		}
 
-		return false;
+		return '';
 	}
 });
+
+Template.createChannel.events({
+	'input #create-channel-input'(e, t) {
+		t.channelName.set(e.target.value);
+	}
+});
+
+Template.createChannel.onCreated(function() {
+	this.channelName = new ReactiveVar('');
+});