diff --git a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
index 2f8fc8260..0a5bfc182 100644
--- a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
+++ b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
@@ -333,9 +333,9 @@ function setupUI() {
             shuffleButton.removeAttr('disabled');
         }
     } else if (!shuffleButton.hasClass('ui-state-disabled')) {
-        if (!shuffleButton.hasClass('ui-state-disabled')) {
-            shuffleButton.addClass('ui-state-disabled');
+        if (shuffleButton.attr('disabled') === undefined) {
             shuffleButton.attr('disabled', 'disabled');
+            shuffleButton.addClass('ui-state-disabled');
         }
     }