Bug 954493 - Focus broken when renaming a contact.

im/content/blist.css

@@ -40,6 +40,7 @@ contact {
   -moz-box-align: center;
 }
 contact[open],
+contact[aliasing],
 #buddylistbox:focus > contact[selected] {
   -moz-binding: url("chrome://instantbird/content/contact.xml#contact-big");
   -moz-box-orient: vertical;
@@ -146,7 +147,7 @@ tooltip[type="buddy"] {
 
 group:not([id="group-1"]):hover .hideGroupButton,
 contact[cansend]:hover .startChatBubble,
-contact[cansend][selected] .startChatBubble {
+#buddylistbox:focus > contact[cansend][selected] .startChatBubble {
   display: -moz-box;
 }
 

im/content/blist.js

@@ -760,7 +760,10 @@ var buddyList = {
 
   // Handle key pressing
   keyPress: function bl_keyPress(aEvent) {
-    var item = aEvent.target.selectedItem;
+    let target = aEvent.target;
+    while (target && target.localName != "richlistbox")
+      target = target.parentNode;
+    var item = target.selectedItem;
     if (!item || !item.parentNode) // empty list or item no longer in the list
       return;
     item.keyPress(aEvent);