diff --git a/static/js/directives/roombar.js b/static/js/directives/roombar.js
index 27918f0b..83b32724 100644
--- a/static/js/directives/roombar.js
+++ b/static/js/directives/roombar.js
@@ -25,7 +25,7 @@ define(['underscore', 'angular', 'text!partials/roombar.html'], function(_, angu
 	// roomBar
 	return ["$window", "rooms", function($window, rooms) {
 
-		var link = function($scope) {
+		var link = function($scope, $element) {
 			var clearRoomName = function(ev) {
 				$scope.currentRoomName = $scope.newRoomName = "";
 			};
@@ -64,6 +64,10 @@ define(['underscore', 'angular', 'text!partials/roombar.html'], function(_, angu
 				}
 			});
 
+			$scope.$watch("layout.roombar", function(value) {
+				$element.find("input").focus();
+			});
+
 			clearRoomName();
 		};