diff --git a/CHANGES.md b/CHANGES.md
index 59623bde..29644a5c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -16,7 +16,7 @@
 * Change autoProcessTV scripts python code quotes from " -> '
 * Add expand all button to Episode Status Management
 * Add Unknown status query to Episode Status Management
-
+* Fix Episode Status Management error popup from coming up when show is selected without expanding
 
 [develop changelog]
 * Fix traceback error when using the menu item Manage/Update Kodi
diff --git a/gui/slick/interfaces/default/manage_episodeStatuses.tmpl b/gui/slick/interfaces/default/manage_episodeStatuses.tmpl
index 9f67d8c1..b9587f86 100644
--- a/gui/slick/interfaces/default/manage_episodeStatuses.tmpl
+++ b/gui/slick/interfaces/default/manage_episodeStatuses.tmpl
@@ -41,7 +41,7 @@
 <h3>${len($sorted_show_ids)} Shows containing <span class="grey-text">$common.statusStrings[$int($whichStatus)]</span> episodes</h3>
 
 #if $whichStatus in ($common.ARCHIVED, $common.IGNORED, $common.SNATCHED):
-    #set $row_class = "good"
+    #set $row_class = 'good'
 #else
     #set $row_class = $common.Overview.overviewStrings[$whichStatus]
 #end if
diff --git a/gui/slick/js/manageEpisodeStatuses.js b/gui/slick/js/manageEpisodeStatuses.js
index af8919f3..8b31e102 100644
--- a/gui/slick/js/manageEpisodeStatuses.js
+++ b/gui/slick/js/manageEpisodeStatuses.js
@@ -16,12 +16,10 @@ $(document).ready(function() {
 	}
 
 	$('.go').click(function() {
-		var selected;
-
-		if (selected = (0 === $('input[class*="-epcheck"]:checked').length))
-			alert('Please select at least one episode');
-
-		return !selected
+		if ($('input[class*="-epcheck"]:checked').length === 0 && $('input[id*="allCheck-"]:checked').length === 0) {
+			alert('Please select at least one Show or Episode');
+			return false
+		}
 	});
 
 	$('.allCheck').click(function(){