diff --git a/ChangeLog b/ChangeLog
index fec0bed5b..0e48bfd19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ Bug fixes:
 - #7082 Windows client doesn't resume connection after sleep
 - #7089 Modifier keys don't work on Microsoft Remote Desktop
 - #7091 Fix CMakeFileList for unittests
+- #7092 Synergy is running after quit on Linux
 
 Enhancements:
 - #7068 Add Synergy restart when settings changed
diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index 723e35fb4..b847703f0 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -1506,6 +1506,13 @@ void MainWindow::enableClient(bool enable)
     }
 }
 
+void MainWindow::closeEvent(QCloseEvent* event)
+{
+#if defined (Q_OS_LINUX)
+    QCoreApplication::quit();
+#endif
+    QWidget::closeEvent(event);
+}
 
 void MainWindow::on_m_pRadioGroupServer_clicked(bool)
 {
diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h
index 748a311de..cf1205b5d 100644
--- a/src/gui/src/MainWindow.h
+++ b/src/gui/src/MainWindow.h
@@ -195,6 +195,7 @@ public slots:
         void retranslateMenuBar();
         void enableServer(bool enable);
         void enableClient(bool enable);
+        void closeEvent(QCloseEvent* event) override;
 
 #if defined(Q_OS_WIN)
         bool isServiceRunning(QString name);