diff --git a/interface/src/ui/ChatWindow.cpp b/interface/src/ui/ChatWindow.cpp
index 445aec62c2..fde77334f4 100644
--- a/interface/src/ui/ChatWindow.cpp
+++ b/interface/src/ui/ChatWindow.cpp
@@ -80,7 +80,7 @@ ChatWindow::ChatWindow(QWidget* parent) :
     } else {
         ui->numOnlineLabel->hide();
         ui->closeButton->hide();
-        ui->usersWidget->hide();
+        ui->usersArea->hide();
         ui->messagesScrollArea->hide();
         ui->messagePlainTextEdit->hide();
         connect(&XmppClient::getInstance(), SIGNAL(joinedPublicChatRoom()), this, SLOT(connected()));
@@ -208,7 +208,7 @@ void ChatWindow::connected() {
     ui->connectingToXMPPLabel->hide();
     ui->numOnlineLabel->show();
     ui->closeButton->show();
-    ui->usersWidget->show();
+    ui->usersArea->show();
     ui->messagesScrollArea->show();
     ui->messagePlainTextEdit->show();
     ui->messagePlainTextEdit->setFocus();
@@ -248,6 +248,7 @@ void ChatWindow::notificationClicked() {
             return;
         }
     }
+    Application::processEvents();
 
     scrollToBottom();
 }
@@ -262,6 +263,8 @@ void ChatWindow::error(QXmppClient::Error error) {
 }
 
 void ChatWindow::participantsChanged() {
+    bool atBottom = isNearBottom();
+
     QStringList participants = XmppClient::getInstance().getPublicChatRoom()->participants();
     ui->numOnlineLabel->setText(tr("%1 online now:").arg(participants.count()));
 
@@ -288,6 +291,11 @@ void ChatWindow::participantsChanged() {
         userLabel->installEventFilter(this);
         ui->usersWidget->layout()->addWidget(userLabel);
     }
+    Application::processEvents();
+
+    if (atBottom) {
+        scrollToBottom();
+    }
 }
 
 void ChatWindow::messageReceived(const QXmppMessage& message) {
diff --git a/interface/ui/chatWindow.ui b/interface/ui/chatWindow.ui
index 4d223b2665..46ccafd5f8 100644
--- a/interface/ui/chatWindow.ui
+++ b/interface/ui/chatWindow.ui
@@ -128,19 +128,43 @@ QPushButton:pressed {
       </layout>
      </item>
      <item>
-      <widget class="QWidget" name="usersWidget" native="true">
-       <property name="styleSheet">
-        <string notr="true">#usersWidget {
-	margin-right: 20px;
-}</string>
+      <widget class="QWidget" name="usersArea" native="true">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
        </property>
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+        <property name="sizeConstraint">
+         <enum>QLayout::SetDefaultConstraint</enum>
+        </property>
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
+         <number>12</number>
+        </property>
+        <item>
+         <widget class="QWidget" name="usersWidget" native="true"/>
+        </item>
+       </layout>
       </widget>
      </item>
      <item>
       <widget class="QScrollArea" name="messagesScrollArea">
-       <property name="styleSheet">
-        <string notr="true">margin-top: 12px;</string>
-       </property>
        <property name="horizontalScrollBarPolicy">
         <enum>Qt::ScrollBarAlwaysOff</enum>
        </property>