diff --git a/airtime_mvc/application/views/scripts/playlist/playlist.phtml b/airtime_mvc/application/views/scripts/playlist/playlist.phtml
index b9f107aae..7d4acb63b 100644
--- a/airtime_mvc/application/views/scripts/playlist/playlist.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/playlist.phtml
@@ -44,7 +44,7 @@ if (isset($this->obj)) {
             <button class="btn" title='<?php echo _("Shuffle playlist") ?>' type="button" id="playlist_shuffle_button"><?php echo _("Shuffle") ?></button>
         </div>
         <div class='btn-group'>
-            <button id="spl_crossfade" class="btn crossfade-main-button" <?php if ($count <= 0) echo "disabled=disabled"; ?>>
+            <button id="spl_crossfade" class="btn crossfade-main-button">
                 <i class='crossfade-main-icon'></i><span class="ui-button-text"><?php echo _("Playlist crossfade") ?></span>
             </button>
         </div>
diff --git a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
index adaf45e24..f6cc77625 100644
--- a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
@@ -52,7 +52,7 @@ if (isset($this->obj)) {
             <?php echo $this->form->getElement('shuffle_button');?>
         </div>
         <div class='btn-group'>
-            <button id="spl_crossfade" class="btn crossfade-main-button" <?php if (!$this->obj->isStatic() || $count <= 0) echo "disabled=disabled"; ?>>
+            <button id="spl_crossfade" class="btn crossfade-main-button">
                 <i class='crossfade-main-icon'></i><span class="ui-button-text"><?php echo _("Playlist crossfade") ?></span>
             </button>
         </div>
diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js
index c6c97adcc..19757efcd 100644
--- a/airtime_mvc/public/js/airtime/library/spl.js
+++ b/airtime_mvc/public/js/airtime/library/spl.js
@@ -406,7 +406,7 @@ var AIRTIME = (function(AIRTIME){
         var empty = $pl.find(".spl_empty");
 
         if (!show || empty.length > 0) {
-            //$pl.find("#spl_crossfade").hide();
+            $pl.find("#spl_crossfade").attr("disabled", "disabled");
         } else {
             //get list of playlist contents
             var list = contents.children();
@@ -416,9 +416,9 @@ var AIRTIME = (function(AIRTIME){
             var last = list.last();
             if (first.find(':first-child').children().attr('blockid') !== undefined &&
                 last.find(':first-child').children().attr('blockid') !== undefined) {
-                //$pl.find("#spl_crossfade").hide();
+                $pl.find("#spl_crossfade").attr("disabled", "disabled");
             } else {
-                $pl.find("#spl_crossfade").show();
+                $pl.find("#spl_crossfade").removeAttr("disabled");
             }
         }