diff --git a/application/views/scripts/schedule/add-show-form.phtml b/application/views/scripts/schedule/add-show-form.phtml
new file mode 100644
index 000000000..1b3ca6d40
--- /dev/null
+++ b/application/views/scripts/schedule/add-show-form.phtml
@@ -0,0 +1,25 @@
+<form id="add-show-form" method="post" action="" style="display:none;">
+    <div id="schedule-add-show" class="tabs ui-widget ui-widget-content block-shadow alpha-block padded">
+        <div class="button-bar">
+            <button id="add-show-submit" class="right-floated">Add this show</button>
+            <button id="add-show-close" class="right-floated">Close</button>
+        </div>
+        <div class="clear"></div>
+        <div id="schedule-show-what">
+        <?php echo $this->what ?>
+        </div>
+        <h3 class="collapsible-header"><span class="arrow-icon"></span>When</h3>
+        <div id="schedule-show-when" class="collapsible-content">
+        <?php echo $this->when ?>
+        <?php echo $this->repeats ?>
+        </div>
+        <h3 class="collapsible-header"><span class="arrow-icon"></span>Who</h3>
+        <div id="schedule-show-who" class="collapsible-content">
+        <?php echo $this->who ?>
+        </div>
+        <h3 class="collapsible-header"><span class="arrow-icon"></span>Style</h3>
+        <div id="schedule-show-style" class="collapsible-content">
+        <?php echo $this->style ?>
+        </div>
+    </div>
+</form>
diff --git a/public/js/airtime/schedule/add-show.js b/public/js/airtime/schedule/add-show.js
index 0afe6f753..d0fb0e2b2 100644
--- a/public/js/airtime/schedule/add-show.js
+++ b/public/js/airtime/schedule/add-show.js
@@ -123,9 +123,6 @@ function setAddShowEvents() {
             $("#schedule_calendar").width(y+z+50);
             $("#schedule_calendar").fullCalendar('render');
 			$("#add-show-form").hide();
-
-            //in full-calendar-functions.js
-            makeAddShowButton();
 		});
 
 	$("#add-show-submit")
diff --git a/public/js/airtime/schedule/full-calendar-functions.js b/public/js/airtime/schedule/full-calendar-functions.js
index c547602a0..0033469ad 100644
--- a/public/js/airtime/schedule/full-calendar-functions.js
+++ b/public/js/airtime/schedule/full-calendar-functions.js
@@ -15,7 +15,10 @@ function makeAddShowButton(){
                 var z = $("#schedule-add-show").width();
                 $("#schedule_calendar").width(y-z-50);
                 $("#schedule_calendar").fullCalendar('render');
-                $(this).remove();
+
+                var td = $(this).parent();
+                $(td).prev().remove();
+                $(td).remove();
             });
 }
 
@@ -68,7 +71,7 @@ function viewDisplay( view ) {
 
     }
 
-    if($("#add-show-form").length == 1 && $('.fc-header-left tbody td').length === 5) {
+    if(($("#add-show-form").length == 1) && ($('.fc-header-left tbody td').length == 5)) {
         makeAddShowButton();
     }
 }