diff --git a/mixer/src/Mixer.C b/mixer/src/Mixer.C
index 8e962b1..2895d47 100644
--- a/mixer/src/Mixer.C
+++ b/mixer/src/Mixer.C
@@ -1131,11 +1131,14 @@ Mixer::command_load ( const char *path, const char *display_name )
 {
     mixer->deactivate();
 
+    Project::close();
+    
+    char *pwd = (char*)malloc( PATH_MAX + 1 );
+    getcwd( pwd, PATH_MAX );
     chdir( path );
-
     load_project_settings();
-
-    Project::close();
+    chdir( pwd );
+    free( pwd );
 
     if ( Project::open( path ) )
     {
diff --git a/mixer/src/Project.C b/mixer/src/Project.C
index acd50fa..2ba92cf 100644
--- a/mixer/src/Project.C
+++ b/mixer/src/Project.C
@@ -272,10 +272,10 @@ Project::open ( const char *name )
     else
         *_created_on = 0;
 
-    set_name( name );
 
-    *_path = '\0';
-    fl_filename_absolute( _path, sizeof( _path ), "." );
+    getcwd( _path, sizeof( _path ) );
+
+    set_name( _path );
 
     _is_open = true;