diff --git a/airtime_mvc/application/views/scripts/library/publish-dialog.phtml b/airtime_mvc/application/views/scripts/library/publish-dialog.phtml
index a297cc425..5d95b9ab9 100644
--- a/airtime_mvc/application/views/scripts/library/publish-dialog.phtml
+++ b/airtime_mvc/application/views/scripts/library/publish-dialog.phtml
@@ -45,12 +45,12 @@
 
     <div class="btn-toolbar clearfix">
         <div class="btn-group pull-right">
-            <button ng-click="discard()" class="btn" type="button" name="cancel">
+            <button ng-click="discard()" class="btn" type="button" name="close">
                 <?php echo _("Close") ?>
             </button>
         </div>
         <div class='btn-group pull-right'>
-            <button ng-click="publish()" class="btn" title='<?php echo _("Publish") ?>' type="button">
+            <button disabled="disabled" ng-click="publish()" class="btn publish-btn" title='<?php echo _("Publish") ?>' type="button">
                 <?php echo _("Publish") ?>
             </button>
         </div>
diff --git a/airtime_mvc/public/js/airtime/library/publish.js b/airtime_mvc/public/js/airtime/library/publish.js
index d4b461851..2a3d23b3c 100644
--- a/airtime_mvc/public/js/airtime/library/publish.js
+++ b/airtime_mvc/public/js/airtime/library/publish.js
@@ -19,6 +19,16 @@ var AIRTIME = (function (AIRTIME) {
             $scope.publishData = {};
             var sourceInterval;
 
+            tab.contents.on("click", "input[type='checkbox']", function () {
+                var noSourcesChecked = true;
+                $.each(tab.contents.find("input[type='checkbox']"), function () {
+                    if ($(this).is(":checked")) {
+                        noSourcesChecked = false;
+                    }
+                });
+                tab.contents.find(".publish-btn").prop("disabled", noSourcesChecked);
+            });
+
             function fetchSourceData() {
                 var csrfToken = jQuery("#csrf").val();
                 $http.get(endpoint + mediaId, {csrf_token: csrfToken})