diff --git a/src/Model/Saved.py b/src/Model/Saved.py
index b11ed471706b210a6938aceaf88c05ca71c2d539..3f672731b7d329fbf1a11b123e7e1dd08b29a3f1 100644
--- a/src/Model/Saved.py
+++ b/src/Model/Saved.py
@@ -1,5 +1,9 @@
 # -*- coding: utf-8 -*-
 
+import logging
+
+logger = logging.getLogger()
+
 class SavedStatus(object):
     def __init__(self):
         super(SavedStatus, self).__init__()
@@ -9,9 +13,9 @@ class SavedStatus(object):
         return self._saved
 
     def save(self):
-        # print(" * save")
+        logger.debug("model status set as saved")
         self._saved = True
 
     def modified(self):
-        # print(" * modified ...")
+        logger.debug("model status set as modified")
         self._saved = False
diff --git a/src/Model/Study.py b/src/Model/Study.py
index c10058405cc1e887b79fe4d21ec6d9bcab854ceb..413838ad5d9b3354a6bb4e98fc4ccb46a779ee63 100644
--- a/src/Model/Study.py
+++ b/src/Model/Study.py
@@ -74,7 +74,7 @@ class Study(SQLModel):
         fdir, fname = os.path.split(self.filename)
 
         if self._old_save_id == 0:
-            old_dir = os.path.join(fdir, "__old__")
+            old_dir = os.path.join(fdir, "_PAMHYR_", "__old__")
             if os.name == "nt":
                 old_dir = old_dir.replace("/", "\\")
 
@@ -87,7 +87,7 @@ class Study(SQLModel):
                 logger.error(e)
 
         fname = fname + "." + str(self._old_save_id)
-        filename = os.path.join(fdir, "__old__", fname)
+        filename = os.path.join(fdir, "_PAMHYR_", "__old__", fname)
         shutil.copy(self.filename, filename)
         self._old_save_id += 1
 
diff --git a/src/View/MainWindow.py b/src/View/MainWindow.py
index d44e53f09f2668bc0fae6deedabd8537a7d9a73a..52dba9fc6abdf6c4965fb33696ac29fb97483910 100644
--- a/src/View/MainWindow.py
+++ b/src/View/MainWindow.py
@@ -298,6 +298,9 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
             else:
                 self.model.filename = file_name + ".pamhyr"
 
+        if self.model.is_saved:
+            return
+
         logger.info("Save...")
         self.model.save()