diff --git a/scdl/scdl.py b/scdl/scdl.py
index 41f7f99..dc99ddd 100755
--- a/scdl/scdl.py
+++ b/scdl/scdl.py
@@ -386,7 +386,8 @@ def download_playlist(playlist):
                 logger.info('Track n°{0}'.format(counter))
                 download_track(track_raw, playlist['title'], playlist_file)
     finally:
-        os.chdir('..')
+        if not arguments['--no-playlist-folder']:
+            os.chdir('..')
 
 
 def download_my_stream():