diff --git a/application/models/Shows.php b/application/models/Shows.php
index 104a4eaa2..3f93f7d48 100644
--- a/application/models/Shows.php
+++ b/application/models/Shows.php
@@ -259,10 +259,12 @@ class Show {
 			$sql = $sql_gen ." WHERE ((". $sql_day .") AND (". $sql_range ."))";
 		}
 		if(!is_null($s_time) && !is_null($e_time)) {
-			$sql_time = "(start_time <= '{$s_time}' AND end_time >= '{$e_time}' AND '{$s_time}' < '{$e_time}')
-				OR (start_time >= '{$s_time}' AND end_time <= '{$e_time}' AND '{$s_time}' > '{$e_time}')
+			$sql_time = "(start_time <= '{$s_time}' AND end_time >= '{$e_time}' AND start_time < end_time AND '{$s_time}' < '{$e_time}')
+				OR (start_time >= '{$s_time}' AND end_time <= '{$e_time}' AND start_time > end_time AND '{$s_time}' > '{$e_time}')
 				OR (start_time >= '{$s_time}' AND end_time <= '{$e_time}' AND start_time < end_time)
 				OR (start_time <= '{$s_time}' AND end_time >= '{$e_time}' AND start_time > end_time)
+				OR (start_time <= '{$s_time}' AND end_time <= '{$e_time}' AND start_time > end_time AND '{$s_time}' > '{$e_time}')
+				OR (start_time >= '{$s_time}' AND end_time >= '{$e_time}' AND start_time > end_time AND '{$s_time}' > '{$e_time}')
 				OR (end_time > '{$s_time}' AND end_time <= '{$e_time}')
 				OR (start_time >= '{$s_time}' AND start_time < '{$e_time}')";
 
@@ -371,7 +373,7 @@ class Show {
 		}
 
 		if($this->_user->isAdmin()) {
-			$event["editable"] = true;
+			//$event["editable"] = true;
 		}
 
 		if($this->_user->isHost($show["show_id"])) {
diff --git a/public/js/campcaster/schedule/schedule.js b/public/js/campcaster/schedule/schedule.js
index d9b2a9812..0f28c352c 100644
--- a/public/js/campcaster/schedule/schedule.js
+++ b/public/js/campcaster/schedule/schedule.js
@@ -61,6 +61,7 @@ function submitShow() {
 		function(data){
 			if(data.form) {
 				dialog.find("form").remove();
+				dialog.find("#show_overlap_error").remove();
 				dialog.append(data.form);
 
 				var start  = dialog.find("#start_date");
@@ -70,8 +71,9 @@ function submitShow() {
 				createDateInput(end, endDpSelect);
 
 				if(data.overlap) {
-					var table, tr, days;
-					table = $("<table/>");
+					var div, table, tr, days;
+					div = $('<div id="show_overlap_error"/>');
+					table = $('<table/>');
 					days = $.datepicker.regional[''].dayNamesShort;
 
 					$.each(data.overlap, function(i, val){
@@ -85,8 +87,9 @@ function submitShow() {
 						table.append(tr);
 					});
 				
-					dialog.append("<span>Cannot add show. New show overlaps the following shows:</span>");
-					dialog.append(table);
+					div.append("<span>Cannot add show. New show overlaps the following shows:</span>");
+					div.append(table);
+					dialog.append(div);
 				}
 	
 			}