diff --git a/index.php b/index.php
index ad90e38f..9dc893e0 100644
--- a/index.php
+++ b/index.php
@@ -274,7 +274,7 @@ xhtml_object($data,"main-content");
 
 <?php  if ($chat) { ?>
      <div class="tabbertab <?php  if ((DEFAULT_TAB == 'chat' && !$appointment) || (DEFAULT_TAB_APPOINTMENT == 'chat' && $appointment)) 
-					print "tabbertabdefault"; ?>">
+					print "tabbertabdefault"; ?>" id="tab-chat">
 	  <h2><?php  echo T_("Supervisor chat"); ?></h2>
 	  <div id="div-supervisorchat" class="tabberdiv"><?php xhtml_object("supervisorchat.php","main-supervisorchat");?></div>
      </div>
diff --git a/js/supervisorchat.js b/js/supervisorchat.js
index 1946e886..b1d25960 100644
--- a/js/supervisorchat.js
+++ b/js/supervisorchat.js
@@ -33,11 +33,26 @@ function OnMessageStanza(stanza)
 	//alert(sFrom + ':' + sType  + ':' + sBody + ':' + sBareJid);
 	// do something, e.g. show sBody with jQuer
 
-	//make sure the chat tab is in focus when an incoming messages appears
 
 	//display message as new row in message table if it is from the supervisor
 	if (sBareJid == SUPERVISOR_XMPP)
 	{
+		//make sure the chat tab is in focus when an incoming messages appears
+		
+		//find the index of div-supervisorchat (children of tab-main)
+		var tm = parent.document.getElementById('tab-main')
+		var i = 0;
+
+		for (i=0;i<tm.children.length;i++)
+		{
+			if (tm.children[i].id == 'tab-chat')
+			{
+				break;
+			}
+		}
+
+		tm.tabber.tabShow(i-1);
+
 		var html = '<tr><td>' + SUPERVISOR_NAME + '</td><td>' + sBody + '</td></tr>';
 		$('#chattable > tbody > tr').eq(0).after(html);
 	}
diff --git a/supervisorchat.php b/supervisorchat.php
index 8539a6eb..f62653ca 100644
--- a/supervisorchat.php
+++ b/supervisorchat.php
@@ -84,7 +84,7 @@ if ($chatenabled && operator_chat_enabled($operator_id))
 	print "<div style='display:none' id='statusavailable'>" . T_("Supervisor is available") . "</div>";
 	print "<div id='statusunavailable'>" . T_("Supervisor not available") . "</div>";
 
-	print "<div id='chatbox'><input type='text' id='chattext'/> <div id='chatclick'>" . T_("Send") . "</div></div>";
+	print "<div id='chatbox'><label for='chattext'>" . T_("Message") . ":</label><input type='text' id='chattext'/> <input type='submit' id='chatclick' value='" . T_("Send") . "'/></div>";
 
 	//table for chat messages
 	print "<table class='tclass' id='chattable'><tbody><tr><th>" . T_("From") . "</th><th>" . T_("Message") . "</th></tr></tbody></table>";