@@ -3,6 +3,7 @@ Xmpp.Views.Chat ||= {}

 class Xmpp.Views.Chat.WindowView extends Backbone.View

   template: JST["backbone/templates/chat/window"]

   el: $('#conversation-js')

+  inputSelector: 'input[type=text]'

   maxHistoryLength: 20

@@ -30,6 +31,7 @@ class Xmpp.Views.Chat.WindowView extends Backbone.View

   show: ->

     $(@el).removeClass('hidden')

     @delegateEvents()

+    $(@el).find(@inputSelector).focus()

     this

   remove: ->

@@ -44,9 +46,9 @@ class Xmpp.Views.Chat.WindowView extends Backbone.View

   sendMessage: (e) ->

     e.preventDefault()

     $this = $(e.currentTarget)

-    input = $this.find('input[type=text]')

+    input = $this.find(@inputSelector)

     message = input.val().trim()

-    input.val('')

+    input.val('').focus()

     if (message)

       @tab.getOwner().sendMessage(message, @tab.getChatId()