diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js
index 21d0b5c43..c64825393 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js
@@ -649,6 +649,8 @@ var AIRTIME = (function(AIRTIME){
             },
             "fnDrawCallback": function fnBuilderDrawCallback(oSettings, json) {
                 if (!isInitialized) {
+                    //when coming to 'Now Playing' page we want the page
+                    //to jump to the current track
                     if ($(this).find("."+NOW_PLAYING_CLASS).length > 0) {
                         mod.jumpToCurrentTrack();
                     }
@@ -985,13 +987,18 @@ var AIRTIME = (function(AIRTIME){
                     "<i class='icon-white icon-cut'></i></button></div>")
             .append("<div class='btn-group'>" +
                     "<button title='Remove selected scheduled items' class='ui-state-disabled btn btn-small' disabled='disabled'>" +
-                    "<i class='icon-white icon-trash'></i></button></div>")
-            .append("<div class='btn-group'>" +
+                    "<i class='icon-white icon-trash'></i></button></div>");
+
+        //if 'Add/Remove content' was chosen from the context menu
+        //in the Calendar do not append these buttons
+        if ($(".ui-dialog-content").length === 0) {
+            $menu.append("<div class='btn-group'>" +
                     "<button  title='Jump to the current playing track' class='ui-state-disabled btn btn-small' disabled='disabled'>" +
                     "<i class='icon-white icon-step-forward'></i></button></div>")
             .append("<div class='btn-group'>" +
                     "<button title='Cancel current show' class='ui-state-disabled btn btn-small btn-danger' disabled='disabled'>" +
                     "<i class='icon-white icon-ban-circle'></i></button></div>");
+        }
 
         $toolbar.append($menu);
         $menu = undefined;