diff --git a/interface/interface_en.ts b/interface/interface_en.ts
index c52ec91671..434acb80be 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="1362"/>
+        <location filename="src/Application.cpp" line="1354"/>
         <source>Export Voxels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/Application.cpp" line="1363"/>
+        <location filename="src/Application.cpp" line="1355"/>
         <source>Sparse Voxel Octree Files (*.svo)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/Application.cpp" line="3573"/>
+        <location filename="src/Application.cpp" line="3565"/>
         <source>Open Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/Application.cpp" line="3574"/>
+        <location filename="src/Application.cpp" line="3566"/>
         <source>JavaScript Files (*.js)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -45,7 +45,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/ui/ChatWindow.cpp" line="124"/>
+        <location filename="src/ui/ChatWindow.cpp" line="123"/>
         <source>day</source>
         <translation>
             <numerusform>%n day</numerusform>
@@ -53,7 +53,7 @@
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="src/ui/ChatWindow.cpp" line="124"/>
+        <location filename="src/ui/ChatWindow.cpp" line="123"/>
         <source>hour</source>
         <translation>
             <numerusform>%n hour</numerusform>
@@ -61,7 +61,7 @@
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="src/ui/ChatWindow.cpp" line="124"/>
+        <location filename="src/ui/ChatWindow.cpp" line="123"/>
         <source>minute</source>
         <translation>
             <numerusform>%n minute</numerusform>
@@ -76,7 +76,7 @@
         </translation>
     </message>
     <message>
-        <location filename="src/ui/ChatWindow.cpp" line="179"/>
+        <location filename="src/ui/ChatWindow.cpp" line="178"/>
         <source>%1 online now:</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index fedde89a38..37b2810c68 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -27,7 +27,6 @@
 #include <QColorDialog>
 #include <QDesktopWidget>
 #include <QCheckBox>
-#include <QHBoxLayout>
 #include <QImage>
 #include <QKeyEvent>
 #include <QMainWindow>
@@ -292,14 +291,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
     ResourceCache::setNetworkAccessManager(_networkAccessManager);
     ResourceCache::setRequestLimit(3);
 
-    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);
+    _window->setCentralWidget(_glWidget);
 
     restoreSizeAndPosition();
 
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 15cfb78cca..22b441d868 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -1044,10 +1044,8 @@ void Menu::showMetavoxelEditor() {
 
 void Menu::showChat() {
     if (!_chatWindow) {
-        _chatWindow = new ChatWindow();
-        QMainWindow* mainWindow = Application::getInstance()->getWindow();
-        QBoxLayout* boxLayout = static_cast<QBoxLayout*>(mainWindow->centralWidget()->layout());
-        boxLayout->addWidget(_chatWindow, 0, Qt::AlignRight);
+        Application::getInstance()->getWindow()->addDockWidget(Qt::RightDockWidgetArea, _chatWindow = new ChatWindow());
+        
     } else {
         if (!_chatWindow->isVisible()) {
             _chatWindow->show();
diff --git a/interface/src/ui/ChatWindow.cpp b/interface/src/ui/ChatWindow.cpp
index 103f045cfa..e28051f214 100644
--- a/interface/src/ui/ChatWindow.cpp
+++ b/interface/src/ui/ChatWindow.cpp
@@ -28,7 +28,6 @@ const int NUM_MESSAGES_TO_TIME_STAMP = 20;
 const QRegularExpression regexLinks("((?:(?:ftp)|(?:https?))://\\S+)");
 
 ChatWindow::ChatWindow() :
-    QWidget(),
     ui(new Ui::ChatWindow),
     numMessagesAfterLastTimeStamp(0)
 {
diff --git a/interface/src/ui/ChatWindow.h b/interface/src/ui/ChatWindow.h
index fbf9fc0859..da8d423b9d 100644
--- a/interface/src/ui/ChatWindow.h
+++ b/interface/src/ui/ChatWindow.h
@@ -10,8 +10,8 @@
 #define __interface__ChatWindow__
 
 #include <QDateTime>
+#include <QDockWidget>
 #include <QTimer>
-#include <QWidget>
 
 #include <Application.h>
 
@@ -26,7 +26,7 @@ namespace Ui {
 class ChatWindow;
 }
 
-class ChatWindow : public QWidget {
+class ChatWindow : public QDockWidget {
     Q_OBJECT
 
 public: