diff --git a/directives/input.html b/directives/input.html
index 43fd60d..65bbc45 100644
--- a/directives/input.html
+++ b/directives/input.html
@@ -1,6 +1,6 @@
 <form class="form form-horizontal" ng-submit="sendMessage()">
   <div class="input-group">
-    <input id="sendMessage" type="text" class="form-control monospace" autocomplete="off" ng-model="command" autofocus>
+    <input id="sendMessage" type="text" class="form-control monospace" autocomplete="off" ng-model="command">
     <span class="input-group-btn">
       <button class="btn btn-default btn-primary">Send</button>
     </span>
diff --git a/js/websockets.js b/js/websockets.js
index 6d16d09..d1097cf 100644
--- a/js/websockets.js
+++ b/js/websockets.js
@@ -751,9 +751,11 @@ weechat.directive('inputBar', function() {
                              models) {
 
             // Focuses itself when active buffer is changed
+            /*
             $rootScope.$on('activeBufferChanged', function() {
                 angular.element('#sendMessage').focus();
             });
+            */
 
             $scope.completeNick = function() {
                 // input DOM node