diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php
index a136bd1a9..11362fa91 100644
--- a/airtime_mvc/application/controllers/PlaylistController.php
+++ b/airtime_mvc/application/controllers/PlaylistController.php
@@ -36,7 +36,12 @@ class PlaylistController extends Zend_Controller_Action
 
     private function changePlaylist($pl_id)
     {
-		$this->pl_sess->id = intval($pl_id);
+        if (is_null($pl_id)) {
+            unset($this->pl_sess->id);
+        }
+        else {
+            $this->pl_sess->id = intval($pl_id);
+        }
     }
 
     private function createUpdateResponse($pl)
@@ -143,11 +148,11 @@ class PlaylistController extends Zend_Controller_Action
                 $this->changePlaylist(null);
             }
             else {
-                $pl = $this->getPlaylist();
                 Logging::log("Not deleting currently active playlist");
             }
 
             Application_Model_Playlist::DeletePlaylists($ids);
+            $pl = $this->getPlaylist();
         }
         catch(PlaylistNotFoundException $e) {
             Logging::log("Playlist not found");
diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js
index 83de360a0..b58a2d87e 100644
--- a/airtime_mvc/public/js/airtime/library/spl.js
+++ b/airtime_mvc/public/js/airtime/library/spl.js
@@ -593,8 +593,9 @@ var AIRTIME = (function(AIRTIME){
 		$(playlist).delegate("#spl_new", 
 	    		{"click": AIRTIME.playlist.fnNew});
 
-		$(playlist).delegate("#spl_delete", 
-	    		{"click": AIRTIME.playlist.fnDelete});
+		$(playlist).delegate("#spl_delete", {"click": function(ev){
+			AIRTIME.playlist.fnDelete();
+		}});
 		
 		setPlaylistEntryEvents(playlist);
 		setCueEvents(playlist);