diff --git a/beat/editor/scripts/editor_cli.py b/beat/editor/scripts/editor_cli.py
index 94980f238300a7209207f39975245e64e1cb317d..8496942320acc8885751b56f1dbbcc5f9f0d7054 100644
--- a/beat/editor/scripts/editor_cli.py
+++ b/beat/editor/scripts/editor_cli.py
@@ -36,6 +36,7 @@ import pkg_resources
 
 from click_plugins import with_plugins
 from PyQt5.QtWidgets import QApplication
+from PyQt5.QtCore import QCoreApplication
 
 from beat.cmdline.click_helper import AliasedGroup
 from beat.cmdline.config import Configuration
@@ -98,6 +99,12 @@ def start(ctx, prefix, cache):
     logger.info("BEAT cache set to `%s'", config.cache)
 
     app = QApplication(sys.argv)
+
+    # MainWindow settings
+    QCoreApplication.setApplicationName("beat.editor")
+    QCoreApplication.setOrganizationName("Idiap")
+    QCoreApplication.setOrganizationDomain("ch.idiap")
+
     mainwindow = MainWindow()
     mainwindow.set_prefix_root(config.path)
     mainwindow.show()
diff --git a/beat/editor/widgets/mainwindow.py b/beat/editor/widgets/mainwindow.py
index dfd009def2a35be66c60574600a775dcb2c5ee33..cca818ebd4bf5bbf7977a99f15153f6f2ac234f8 100644
--- a/beat/editor/widgets/mainwindow.py
+++ b/beat/editor/widgets/mainwindow.py
@@ -44,11 +44,11 @@ class MainWindow(QMainWindow):
         super(MainWindow, self).__init__(parent)
 
         # MainWindow settings
-        self.settings = QSettings("beat", "editor")
-        if not self.settings.value("geometry") is None:
-            self.restoreGeometry(self.settings.value("geometry"))
-        if not self.settings.value("windowState") is None:
-            self.restoreState(self.settings.value("windowState"))
+        settings = QSettings()
+        if not settings.value("geometry") is None:
+            self.restoreGeometry(settings.value("geometry"))
+        if not settings.value("windowState") is None:
+            self.restoreState(settings.value("windowState"))
 
         menubar = self.menuBar()
         fileMenu = menubar.addMenu(self.tr("File"))
@@ -81,6 +81,7 @@ class MainWindow(QMainWindow):
         pass
 
     def closeEvent(self, event):
-        self.settings.setValue("geometry", self.saveGeometry())
-        self.settings.setValue("windowState", self.saveState())
+        settings = QSettings()
+        settings.setValue("geometry", self.saveGeometry())
+        settings.setValue("windowState", self.saveState())
         QMainWindow.closeEvent(self, event)