diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index dbbf98ad08aefdf75d1b2d81ea5f45d4dec39d9e..4a487bd5a7c84a2903a71263358d12b64156aa6f 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -106,10 +106,10 @@ void LLIMFloater::onFocusReceived()
 // virtual
 void LLIMFloater::onClose(bool app_quitting)
 {
-	if (!gIMMgr->hasSession(mSessionID)) return;
-	
 	setTyping(false);
-	gIMMgr->leaveSession(mSessionID);
+	// SJB: We want the close button to hide the session window, not end it
+	// *NOTE: Yhis is functional, but not ideal - it's still closing the floater; we really want to change the behavior of the X button instead.
+	//gIMMgr->leaveSession(mSessionID);
 }
 
 /* static */
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index e972cf39bf7459e239ed470da405923d9d81a996..c20aaea2aa36a0dec737676ba807a7f82b81bcab 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -10,9 +10,9 @@
  top="0"
  can_close="true"
  can_dock="true"
- can_minimize="true"
+ can_minimize="false"
  visible="true"
- width="350"
+ width="300"
  can_resize="true"
  min_width="300"
  min_height="350">
diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
index 763dd7b922055ac2aa41c6bebc22e829e836cc65..2fee2033f6fe1f9d0b48c08ade9f0c877ba6472d 100644
--- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
@@ -8,7 +8,7 @@
     <avatar_list
      color="DkGray2"
      follows="left|top|right|bottom"
-     height="130"
+     height="100"
      ignore_online_status="true"
      layout="topleft"
      left="3"
@@ -32,7 +32,6 @@
      background_visible="true"
      bg_alpha_color="0.2 0.2 0.2 1"
      border="false"
-     bottom="1"
      follows="left|bottom"
      height="70"
      left="0"