diff --git a/index.html b/index.html
index 9f28055..a7cb29b 100644
--- a/index.html
+++ b/index.html
@@ -170,10 +170,10 @@
         <ul class="nav nav-pills nav-stacked">
           <li class="bufferfilter">
             <form role="form">
-              <input class="form-control" type="text" id="bufferFilter" ng-model="search" placeholder="Search">
+              <input class="form-control" type="text" id="bufferFilter" ng-model="search" ng-keydown="handleSearchBoxKey($event)" placeholder="Search">
             </form>
           </li>
-          <li class="" ng-class="{'active': content.active }" ng-repeat="(key, content) in buffers | toArray | filter:{fullName:search} | filter:hasUnread | orderBy:'content.number':true">
+          <li class="buffer" ng-class="{'active': content.active }" ng-repeat="(key, content) in buffers | toArray | filter:{fullName:search} | filter:hasUnread | orderBy:'content.number':true">
             <a href="#" ng-click="setActiveBuffer(content.id)" title="{{ content.fullName }}">
                 <span class="badge pull-right" ng-hide="content.notification" ng-if="content.unread" ng-bind="content.unread"></span>
               <span class="badge pull-right danger" ng-show="content.notification" ng-bind="content.notification"></span>
diff --git a/js/websockets.js b/js/websockets.js
index a345d60..7ec5914 100644
--- a/js/websockets.js
+++ b/js/websockets.js
@@ -449,6 +449,20 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
             return true;
         }
     };
+    $scope.handleSearchBoxKey = function($event) {
+        // Support different browser quirks
+        var code = $event.keyCode ? $event.keyCode : $event.charCode;
+        // Handle escape
+        if(code == 27) {
+          $event.preventDefault();
+          $scope.search = '';
+        } // Handle enter
+        else if (code == 13) {
+          $event.preventDefault();
+          // TODO Switch to first matching buffer and reset query
+          $scope.search = '';
+        }
+    }
 
 }]
                   );