Prevent form submit on submit and not on keydown

packages/rocketchat-ui-sidenav/side-nav/listChannelsFlex.coffee

@@ -36,9 +36,8 @@ Template.listChannelsFlex.events
 			t.limit.set(t.limit.get() + 50)
 	, 200
 
-	'keydown #channel-search': (e) ->
-		if e.keyCode is 13
-			e.preventDefault()
+	'submit .search-form': (e) ->
+		e.preventDefault()
 
 	'keyup #channel-search': _.debounce (e, instance) ->
 		instance.nameFilter.set($(e.currentTarget).val())

packages/rocketchat-ui-sidenav/side-nav/listDirectMessagesFlex.js

@@ -39,10 +39,8 @@ Template.listDirectMessagesFlex.events({
 		SideNav.leaveArrow();
 	},
 
-	'keydown #channel-search': function(e) {
-		if (e.keyCode === 13) {
-			e.preventDefault();
-		}
+	'submit .search-form': function(e) {
+		e.preventDefault();
 	},
 
 	'keyup #channel-search': _.debounce((e, instance) => {