diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 95bdd3fa0..8f7caa7c3 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -133,7 +133,7 @@ MainWindow::MainWindow()
 
     setAcceptDrops(true);
 
-    m_ui->toolBar->setContextMenuPolicy(Qt::PreventContextMenu);
+    m_ui->toolBar->setHidden(config()->get("GUI/HideToolbar").toBool());
 
     // Setup the search widget in the toolbar
     SearchWidget* search = new SearchWidget();
diff --git a/src/gui/MainWindow.ui b/src/gui/MainWindow.ui
index 49c0a6f3b..b67e6ffd1 100644
--- a/src/gui/MainWindow.ui
+++ b/src/gui/MainWindow.ui
@@ -175,6 +175,14 @@
    </layout>
   </widget>
   <widget class="QMenuBar" name="menubar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>800</width>
+     <height>30</height>
+    </rect>
+   </property>
    <property name="contextMenuPolicy">
     <enum>Qt::PreventContextMenu</enum>
    </property>
@@ -280,6 +288,9 @@
    <addaction name="menuHelp"/>
   </widget>
   <widget class="QToolBar" name="toolBar">
+   <property name="contextMenuPolicy">
+    <enum>Qt::PreventContextMenu</enum>
+   </property>
    <property name="movable">
     <bool>false</bool>
    </property>