diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 30bb2cdf3..fa16adb80 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -114,6 +114,8 @@ MainWindow::MainWindow()
 {
     m_ui->setupUi(this);
 
+    m_ui->toolBar->setContextMenuPolicy(Qt::PreventContextMenu);
+
     // Setup the search widget in the toolbar
     SearchWidget *search = new SearchWidget();
     search->connectSignals(m_actionMultiplexer);
@@ -822,11 +824,6 @@ void MainWindow::showGroupContextMenu(const QPoint& globalPos)
     m_ui->menuGroups->popup(globalPos);
 }
 
-void MainWindow::saveToolbarState(bool value)
-{
-    config()->set("ShowToolbar", value);
-}
-
 void MainWindow::setShortcut(QAction* action, QKeySequence::StandardKey standard, int fallback)
 {
     if (!QKeySequence::keyBindings(standard).isEmpty()) {
diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h
index ea17107ad..ade339c56 100644
--- a/src/gui/MainWindow.h
+++ b/src/gui/MainWindow.h
@@ -87,7 +87,6 @@ private slots:
     void updateCopyAttributesMenu();
     void showEntryContextMenu(const QPoint& globalPos);
     void showGroupContextMenu(const QPoint& globalPos);
-    void saveToolbarState(bool value);
     void rememberOpenDatabases(const QString& filePath);
     void applySettingsChanges();
     void trayIconTriggered(QSystemTrayIcon::ActivationReason reason);