diff --git a/ShootingStars/src/org/wyrez/shootingstars/states/SelectTrackState.java b/ShootingStars/src/org/wyrez/shootingstars/states/SelectTrackState.java
index ad2a560..00a91a8 100644
--- a/ShootingStars/src/org/wyrez/shootingstars/states/SelectTrackState.java
+++ b/ShootingStars/src/org/wyrez/shootingstars/states/SelectTrackState.java
@@ -99,11 +99,10 @@ public class SelectTrackState extends AbstractAppState implements SelectFileList
                 settings.setAudioFile(null);
                 if (returnVal == JFileChooser.APPROVE_OPTION) {
                     String parentDictionary = jFileChooser.getSelectedFile().getParent();
-                    //TODO need to be fixed
-//                    if (parentDictionary != null && !parentDictionary.isEmpty()) {
-//                        optionSettings.setFileSelectFolder(parentDictionary);
-//                        optionSettings.save();
-//                    }
+
+                    if (parentDictionary != null && !parentDictionary.isEmpty()) {
+                        optionSettings.setFileSelectFolder(parentDictionary);                        
+                    }
                     File file = jFileChooser.getSelectedFile();
                     settings.setVideoFile(file.getPath());
                     readMetadata(settings.getVideoFile());
@@ -115,6 +114,7 @@ public class SelectTrackState extends AbstractAppState implements SelectFileList
             case 2:
                 if (wasFullscreen) {
                     optionSettings.setFullscreen(true);
+                    optionSettings.save();
                     shootingStars.setSettings(optionSettings.getAppSettings());
                     shootingStars.restart();
                 }