diff --git a/src/View/MainWindow.py b/src/View/MainWindow.py
index 1b5f06e32d9d502a59d6f90dc3f6d1f245b46a13..f3ab0acb14dad545b352e639fe9fd422a6a4ef9a 100644
--- a/src/View/MainWindow.py
+++ b/src/View/MainWindow.py
@@ -229,7 +229,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
                 "", "Pamhyr(*.pamhyr)"
             )
 
-            if file_name[-4:] == ".pamhyr":
+            if file_name.rsplit(".", 1)[-1] == "pamhyr":
                 self.model.filename = file_name
             else:
                 self.model.filename = file_name + ".pamhyr"
diff --git a/src/config.py b/src/config.py
index 16421b8d028ca1ea223f11fa289e58b3a40f3f9e..b58325be2eb5155ed53df65a5dd7ba95a33c5c53 100644
--- a/src/config.py
+++ b/src/config.py
@@ -218,7 +218,7 @@ class Config(SQL):
         self.backup_max = 10
 
         # Editor
-        self.editor = "emacs @file"
+        self.editor = "editor @file"
 
         # Languages
         self.lang = ""