diff --git a/livesupport/products/gLiveSupport/src/GLiveSupport.cxx b/livesupport/products/gLiveSupport/src/GLiveSupport.cxx
index 729f3802f..b446d16f7 100644
--- a/livesupport/products/gLiveSupport/src/GLiveSupport.cxx
+++ b/livesupport/products/gLiveSupport/src/GLiveSupport.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: maroy $
-    Version  : $Revision: 1.15 $
+    Version  : $Revision: 1.16 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/GLiveSupport.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -498,14 +498,16 @@ GLiveSupport :: savePlaylist(void)
     storage->savePlaylist(sessionId, editedPlaylist);
 
     Ptr<Playlist>::Ref      playlist = storage->getPlaylist(sessionId,
-                                                editedPlaylist->getId());
+                                                    editedPlaylist->getId());
 
     // add the saved playlist to the DJ Bag, and update it
     // TODO: if already in the DJ bag, don't add, just pop it to the front
-    djBagContents->push_front(editedPlaylist);
+    djBagContents->push_front(playlist);
     masterPanel->updateDjBagWindow();   
 
-    return editedPlaylist;
+    editedPlaylist.reset();
+
+    return playlist;
 }
 
 
diff --git a/livesupport/products/gLiveSupport/src/SimplePlaylistManagementWindow.cxx b/livesupport/products/gLiveSupport/src/SimplePlaylistManagementWindow.cxx
index ddab8cb4e..fb18aa24b 100644
--- a/livesupport/products/gLiveSupport/src/SimplePlaylistManagementWindow.cxx
+++ b/livesupport/products/gLiveSupport/src/SimplePlaylistManagementWindow.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: maroy $
-    Version  : $Revision: 1.5 $
+    Version  : $Revision: 1.6 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/SimplePlaylistManagementWindow.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -164,6 +164,10 @@ SimplePlaylistManagementWindow :: onSaveButtonClicked (void)        throw ()
         statusBar->set_text(*statusText);
 
         gLiveSupport->releaseEditedPlaylist();
+
+        // clean the entry fields
+        nameEntry->set_text("");
+        entriesModel->clear();
     } catch (XmlRpcException &e) {
         statusBar->set_text(e.what());
     }