diff --git a/interface/interface_en.ts b/interface/interface_en.ts
index 80433032dc..23ea3cc3ba 100644
--- a/interface/interface_en.ts
+++ b/interface/interface_en.ts
@@ -4,22 +4,22 @@
 <context>
     <name>Application</name>
     <message>
-        <location filename="src/Application.cpp" line="1353"/>
+        <location filename="src/Application.cpp" line="1362"/>
         <source>Export Voxels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/Application.cpp" line="1354"/>
+        <location filename="src/Application.cpp" line="1363"/>
         <source>Sparse Voxel Octree Files (*.svo)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/Application.cpp" line="3557"/>
+        <location filename="src/Application.cpp" line="3569"/>
         <source>Open Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/Application.cpp" line="3558"/>
+        <location filename="src/Application.cpp" line="3570"/>
         <source>JavaScript Files (*.js)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27,25 +27,25 @@
 <context>
     <name>ChatWindow</name>
     <message>
-        <location filename="ui/chatWindow.ui" line="14"/>
-        <location filename="../build/interface/ui_chatWindow.h" line="141"/>
+        <location filename="ui/chatWindow.ui" line="20"/>
+        <location filename="../build/interface/ui_chatWindow.h" line="143"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="ui/chatWindow.ui" line="41"/>
-        <location filename="../build/interface/ui_chatWindow.h" line="142"/>
+        <location filename="ui/chatWindow.ui" line="50"/>
+        <location filename="../build/interface/ui_chatWindow.h" line="144"/>
         <source>Connecting to XMPP...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="ui/chatWindow.ui" line="62"/>
-        <location filename="../build/interface/ui_chatWindow.h" line="143"/>
+        <location filename="ui/chatWindow.ui" line="71"/>
+        <location filename="../build/interface/ui_chatWindow.h" line="145"/>
         <source> online now:</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/ui/ChatWindow.cpp" line="115"/>
+        <location filename="src/ui/ChatWindow.cpp" line="124"/>
         <source>day</source>
         <translation>
             <numerusform>%n day</numerusform>
@@ -53,7 +53,7 @@
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="src/ui/ChatWindow.cpp" line="115"/>
+        <location filename="src/ui/ChatWindow.cpp" line="124"/>
         <source>hour</source>
         <translation>
             <numerusform>%n hour</numerusform>
@@ -61,7 +61,7 @@
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="src/ui/ChatWindow.cpp" line="115"/>
+        <location filename="src/ui/ChatWindow.cpp" line="124"/>
         <source>minute</source>
         <translation>
             <numerusform>%n minute</numerusform>
@@ -76,7 +76,7 @@
         </translation>
     </message>
     <message>
-        <location filename="src/ui/ChatWindow.cpp" line="170"/>
+        <location filename="src/ui/ChatWindow.cpp" line="179"/>
         <source>%1 online now:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -113,18 +113,18 @@
 <context>
     <name>Menu</name>
     <message>
-        <location filename="src/Menu.cpp" line="422"/>
+        <location filename="src/Menu.cpp" line="424"/>
         <source>Open .ini config file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/Menu.cpp" line="424"/>
-        <location filename="src/Menu.cpp" line="436"/>
+        <location filename="src/Menu.cpp" line="426"/>
+        <location filename="src/Menu.cpp" line="438"/>
         <source>Text files (*.ini)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/Menu.cpp" line="434"/>
+        <location filename="src/Menu.cpp" line="436"/>
         <source>Save .ini config file</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index aed212c692..b08f8f77f1 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -27,6 +27,7 @@
 #include <QColorDialog>
 #include <QDesktopWidget>
 #include <QCheckBox>
+#include <QHBoxLayout>
 #include <QImage>
 #include <QKeyEvent>
 #include <QMainWindow>
@@ -291,7 +292,14 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
     ResourceCache::setNetworkAccessManager(_networkAccessManager);
     ResourceCache::setRequestLimit(3);
 
-    _window->setCentralWidget(_glWidget);
+    QWidget* centralWidget = new QWidget();
+    QHBoxLayout* mainLayout = new QHBoxLayout();
+    mainLayout->setSpacing(0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
+    centralWidget->setLayout(mainLayout);
+    _glWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+    centralWidget->layout()->addWidget(_glWidget);
+    _window->setCentralWidget(centralWidget);
 
     restoreSizeAndPosition();
 
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 71e24e2382..c92d550fd6 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -1041,22 +1041,20 @@ void Menu::showChat() {
     if (!_chatWindow) {
         _chatWindow = new ChatWindow();
         QMainWindow* mainWindow = Application::getInstance()->getWindow();
-        _chatWindow->setGeometry(mainWindow->width() - _chatWindow->width(),
-                                 mainWindow->geometry().y(),
-                                 _chatWindow->width(),
-                                 mainWindow->height());
+        QBoxLayout* boxLayout = static_cast<QBoxLayout*>(mainWindow->centralWidget()->layout());
+        boxLayout->addWidget(_chatWindow, 0, Qt::AlignRight);
+    } else {
+        if (!_chatWindow->isVisible()) {
+            _chatWindow->show();
+        }
     }
-    if (!_chatWindow->isVisible()) {
-        _chatWindow->show();
-    }
-    _chatWindow->raise();
 }
 
 void Menu::toggleChat() {
 #ifdef HAVE_QXMPP
     _chatAction->setEnabled(XmppClient::getInstance().getXMPPClient().isConnected());
     if (!_chatAction->isEnabled() && _chatWindow) {
-        _chatWindow->close();
+        _chatWindow->hide();
     }
 #endif
 }
diff --git a/interface/src/ui/ChatWindow.cpp b/interface/src/ui/ChatWindow.cpp
index d4f257c0f7..103f045cfa 100644
--- a/interface/src/ui/ChatWindow.cpp
+++ b/interface/src/ui/ChatWindow.cpp
@@ -28,7 +28,7 @@ const int NUM_MESSAGES_TO_TIME_STAMP = 20;
 const QRegularExpression regexLinks("((?:(?:ftp)|(?:https?))://\\S+)");
 
 ChatWindow::ChatWindow() :
-    QDialog(Application::getInstance()->getGLWidget(), Qt::CustomizeWindowHint),
+    QWidget(),
     ui(new Ui::ChatWindow),
     numMessagesAfterLastTimeStamp(0)
 {
@@ -39,7 +39,6 @@ ChatWindow::ChatWindow() :
 
     ui->messagePlainTextEdit->installEventFilter(this);
 
-    setAttribute(Qt::WA_DeleteOnClose);
 #ifdef HAVE_QXMPP
     const QXmppClient& xmppClient = XmppClient::getInstance().getXMPPClient();
     if (xmppClient.isConnected()) {
@@ -72,8 +71,18 @@ ChatWindow::~ChatWindow() {
     delete ui;
 }
 
-void ChatWindow::reject() {
-    hide();
+void ChatWindow::keyPressEvent(QKeyEvent* event) {
+    QWidget::keyPressEvent(event);
+    if (event->key() == Qt::Key_Escape) {
+        hide();
+    }
+}
+
+void ChatWindow::showEvent(QShowEvent* event) {
+    QWidget::showEvent(event);
+    if (!event->spontaneous()) {
+        ui->messagePlainTextEdit->setFocus();
+    }
 }
 
 bool ChatWindow::eventFilter(QObject* sender, QEvent* event) {
diff --git a/interface/src/ui/ChatWindow.h b/interface/src/ui/ChatWindow.h
index 57da4da45d..fbf9fc0859 100644
--- a/interface/src/ui/ChatWindow.h
+++ b/interface/src/ui/ChatWindow.h
@@ -9,9 +9,9 @@
 #ifndef __interface__ChatWindow__
 #define __interface__ChatWindow__
 
-#include <QDialog>
 #include <QDateTime>
 #include <QTimer>
+#include <QWidget>
 
 #include <Application.h>
 
@@ -26,14 +26,15 @@ namespace Ui {
 class ChatWindow;
 }
 
-class ChatWindow : public QDialog {
+class ChatWindow : public QWidget {
     Q_OBJECT
 
 public:
     ChatWindow();
     ~ChatWindow();
 
-    virtual void reject();
+    virtual void keyPressEvent(QKeyEvent *event);
+    virtual void showEvent(QShowEvent* event);
 
 protected:
     bool eventFilter(QObject* sender, QEvent* event);
diff --git a/interface/ui/chatWindow.ui b/interface/ui/chatWindow.ui
index ecb4d79c41..1106fca3cd 100644
--- a/interface/ui/chatWindow.ui
+++ b/interface/ui/chatWindow.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ChatWindow</class>
- <widget class="QDialog" name="ChatWindow">
+ <widget class="QWidget" name="ChatWindow">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -10,9 +10,18 @@
     <height>608</height>
    </rect>
   </property>
+  <property name="minimumSize">
+   <size>
+    <width>400</width>
+    <height>0</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>Chat</string>
   </property>
+  <property name="styleSheet">
+   <string notr="true">font-family: Helvetica, Arial, sans-serif;</string>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
     <number>0</number>
@@ -100,7 +109,7 @@
    <item>
     <widget class="QScrollArea" name="messagesScrollArea">
      <property name="styleSheet">
-      <string notr="true">margin-top: 12px; font-family: Helvetica, Arial, sans-serif;</string>
+      <string notr="true">margin-top: 12px;</string>
      </property>
      <property name="horizontalScrollBarPolicy">
       <enum>Qt::ScrollBarAlwaysOff</enum>
@@ -114,7 +123,7 @@
         <x>0</x>
         <y>0</y>
         <width>358</width>
-        <height>452</height>
+        <height>464</height>
        </rect>
       </property>
       <property name="styleSheet">
@@ -154,6 +163,12 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>60</height>
+      </size>
+     </property>
      <property name="styleSheet">
       <string notr="true">border-color: palette(dark); border-style: solid;  border-left-width: 1px; border-right-width: 1px; border-bottom-width: 1px;</string>
      </property>