diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php
index 9becb88f8..0268b77e1 100644
--- a/airtime_mvc/application/controllers/ScheduleController.php
+++ b/airtime_mvc/application/controllers/ScheduleController.php
@@ -333,6 +333,7 @@ class ScheduleController extends Zend_Controller_Action
     public function getCurrentPlaylistAction()
     {
         $range = Application_Model_Schedule::GetPlayOrderRange();
+        $show = Application_Model_Show::GetCurrentShow();
 
         /* Convert all UTC times to localtime before sending back to user. */
         if (isset($range["previous"])){
@@ -371,6 +372,7 @@ class ScheduleController extends Zend_Controller_Action
         $this->view->switch_status = $switch_status;
         
         $this->view->entries = $range;
+        $this->view->show_name = $show[0]["name"];
     }
 
     public function removeGroupAction()
diff --git a/airtime_mvc/application/views/scripts/playlist/playlist.phtml b/airtime_mvc/application/views/scripts/playlist/playlist.phtml
index a214727b7..b01309bcf 100644
--- a/airtime_mvc/application/views/scripts/playlist/playlist.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/playlist.phtml
@@ -38,7 +38,7 @@
             <dd><span contenteditable="true" class="spl_text_input spl_main_fade_in">00</span></dd>
             <dd class="edit-error"></dd>
             <dt>Fade out (s):</dt>
-            <dd><span contenteditable="true" class="spl_text_input spl_main_fade_out">00/span></dd>
+            <dd><span contenteditable="true" class="spl_text_input spl_main_fade_out">00</span></dd>
             <dd class="edit-error"></dd>
         </dl>
     </div>
@@ -52,4 +52,4 @@
 
 <?php else : ?>
     <div>No open playlist</div>
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
diff --git a/airtime_mvc/public/js/airtime/dashboard/playlist.js b/airtime_mvc/public/js/airtime/dashboard/playlist.js
index 3ad590fb6..368e776d5 100644
--- a/airtime_mvc/public/js/airtime/dashboard/playlist.js
+++ b/airtime_mvc/public/js/airtime/dashboard/playlist.js
@@ -8,6 +8,8 @@ var nextSong = null;
 var currentShow = new Array();
 var nextShow = new Array();
 
+var showName = null;
+
 var currentElem;
 
 var serverUpdateInterval = 5000;
@@ -148,7 +150,21 @@ function updatePlaybar(){
         else
             $('#current').text(currentSong.name+",");
     }else{
-        $('#current').html("Current: <span style='color:red; font-weight:bold'>Nothing Scheduled</span>");
+        if (master_dj_on_air) {
+            if (showName) {
+                $('#current').html("Current: <span style='color:red; font-weight:bold'>"+showName+" - Master Stream</span>");
+            } else {
+                $('#current').html("Current: <span style='color:red; font-weight:bold'>Master Stream</span>");
+            }
+        } else if (live_dj_on_air) {
+            if (showName) {
+                $('#current').html("Current: <span style='color:red; font-weight:bold'>"+showName+" - Live Stream</span>");
+            } else {
+                $('#current').html("Current: <span style='color:red; font-weight:bold'>Live Stream</span>");
+            }
+        } else {
+            $('#current').html("Current: <span style='color:red; font-weight:bold'>Nothing Scheduled</span>");
+        }
     }
 
     if (nextSong !== null){
@@ -346,6 +362,7 @@ function getScheduleFromServer(){
                 parseItems(data.entries);
                 parseSourceStatus(data.source_status);
                 parseSwitchStatus(data.switch_status);
+                showName = data.show_name;
           }, error:function(jqXHR, textStatus, errorThrown){}});
     setTimeout(getScheduleFromServer, serverUpdateInterval);
 }