diff --git a/GUI/src/main/java/cz/fidentis/analyst/project/ProjectPanel.java b/GUI/src/main/java/cz/fidentis/analyst/project/ProjectPanel.java
index 70cc97b4ff466aa6d2890f08180ab232f4865903..38af8f990ce24780780c2bbb2a5eb2308525af3b 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/project/ProjectPanel.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/project/ProjectPanel.java
@@ -782,6 +782,7 @@ public class ProjectPanel extends JPanel {
         model.setRowCount(0);
         checkFaceState(null, false);
         selectedRows.clear();        
+        userPreferences.remove("pathToMostRecentProject");
     }
     
     /**
@@ -813,13 +814,23 @@ public class ProjectPanel extends JPanel {
      */
     public void saveProject() {
         
-        JFileChooser chooser = new JFileChooser();
-        //chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
-        chooser.setFileFilter(new FileNameExtensionFilter("json files (*.json)", "json"));
-        chooser.setAcceptAllFileFilterUsed(true);
-        chooser.showSaveDialog(null);
+        File file;
         
-        File file = chooser.getSelectedFile();
+        // If current project was saved before
+        String path = userPreferences.get("pathToMostRecentProject", "");
+        if (path != null && !path.isEmpty()) {
+            file = Paths.get(path).toFile();
+            
+        // Project was not saved before, user chooses new path where to save project
+        } else {
+            JFileChooser chooser = new JFileChooser();
+            //chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+            chooser.setFileFilter(new FileNameExtensionFilter("json files (*.json)", "json"));
+            chooser.setAcceptAllFileFilterUsed(true);
+            chooser.showSaveDialog(null);
+
+            file = chooser.getSelectedFile();
+        }
         
         if (file != null) {
             String filePath = file.getAbsolutePath();
diff --git a/GUI/src/main/java/cz/fidentis/analyst/project/ProjectTopComp.java b/GUI/src/main/java/cz/fidentis/analyst/project/ProjectTopComp.java
index 06ae6879e7d23e8b12247f75312d4134590aaa93..ad98c996f180e8c9c8ce659a3da2fbb14fbf3b98 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/project/ProjectTopComp.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/project/ProjectTopComp.java
@@ -108,7 +108,7 @@ public final class ProjectTopComp extends TopComponent {
         
         // Asks user whether he wants to create new project or open existing
         projectPanel.openExistingOrNewProject();
-        
+       
         // Pass this class to installer so it can call method of this class on close
         Installer inst = new Installer(this);
     }