diff --git a/build_num b/build_num
index 41a954384..f6a8bfb1d 100644
--- a/build_num
+++ b/build_num
@@ -1 +1 @@
-#define BUILD_NUM 1555
+#define BUILD_NUM 1557
diff --git a/src/gui/FWWindow.cpp b/src/gui/FWWindow.cpp
index 4f42e072d..77536c245 100644
--- a/src/gui/FWWindow.cpp
+++ b/src/gui/FWWindow.cpp
@@ -199,6 +199,18 @@ FWWindow::FWWindow() : QMainWindow(),   // QMainWindow(NULL, Qt::Desktop),
     m_mainWindow->auxiliaryPanel->layout()->addWidget( findWhereUsedWidget );
     findWhereUsedWidget->hide();
 
+
+#if defined(Q_WS_X11) 
+    // Designer adds editorDockWidget to the child widget of the main
+    // window and I can't seem to be able to get rid of this
+    // intermediatery child widget (named "widget"). Reparent editor
+    // dock panel.
+    m_mainWindow->editorDockWidget->setParent(this);
+    addDockWidget(Qt::BottomDockWidgetArea, m_mainWindow->editorDockWidget);
+    m_mainWindow->editorDockWidget->hide();
+#endif
+
+
     oe  = new ObjectEditor((QWidget*)m_mainWindow->objectEditorStack);
     //oe->setCloseButton(m_panel->closeObjectEditorButton);
     oe->setApplyButton(m_mainWindow->applyObjectEditorButton);
@@ -418,6 +430,8 @@ void FWWindow::updateWindowTitle()
 
 void FWWindow::startupLoad()
 {
+
+
     if (st->getCheckUpdates())
     {
         // start http query to get latest version from the web site