diff --git a/static/js/directives/roombar.js b/static/js/directives/roombar.js
index e8b44347..7077266e 100644
--- a/static/js/directives/roombar.js
+++ b/static/js/directives/roombar.js
@@ -42,12 +42,6 @@ define(['underscore', 'angular', 'text!partials/roombar.html'], function(_, angu
 				}
 			};
 
-			$scope.hitEnter = function(evt) {
-				if (angular.equals(evt.keyCode, 13)) {
-					$scope.save();
-				}
-			};
-
 			$scope.exit = function() {
 				$scope.newRoomName = "";
 				$scope.save();
diff --git a/static/partials/roombar.html b/static/partials/roombar.html
index ca8e94b9..5c7e66d8 100644
--- a/static/partials/roombar.html
+++ b/static/partials/roombar.html
@@ -4,7 +4,7 @@
 		<label class="pull-left control-label hidden-xs">{{_('Room')}}</label>
 		<div class="pull-left">
 			<div class="input-group">
-				<input class="form-control input-sm" ng-model="newRoomName" ng-keyup="hitEnter($event)" type="text" placeholder="{{_('Main')}}"></input><span ng-if="currentRoomName && roombarform.$pristine" class="input-group-btn"><a class="btn btn-default btn-sm" title="{{_('Leave room')}}" ng-click="exit()"><i class="fa fa-sign-out"></i></a></span><span ng-if="!currentRoomName || !roombarform.$pristine" class="input-group-btn"><a class="btn btn-default btn-sm" title="{{_('Change room')}}" ng-click="save()"><i class="fa fa-sign-in"></i></a></span>
+				<input class="form-control input-sm" ng-model="newRoomName" on-enter="save()" type="text" placeholder="{{_('Main')}}"></input><span ng-if="currentRoomName && roombarform.$pristine" class="input-group-btn"><a class="btn btn-default btn-sm" title="{{_('Leave room')}}" ng-click="exit()"><i class="fa fa-sign-out"></i></a></span><span ng-if="!currentRoomName || !roombarform.$pristine" class="input-group-btn"><a class="btn btn-default btn-sm" title="{{_('Change room')}}" ng-click="save()"><i class="fa fa-sign-in"></i></a></span>
 			</div>
 		</div>
 		<div class="pull-left">