diff --git a/CHANGES.md b/CHANGES.md
index 5a304e3a..d34fefef 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -23,6 +23,7 @@
 * Update PyNMA to hybrid v1.0
 * Change first run after install to set up the main db to the current schema instead of upgrading
 * Change don't create a backup from an initial zero byte main database file, PEP8 and code tidy up
+* Fix show list view when no shows exist and "Group show lists shows into" is set to anything other than "One Show List"
 
 [develop changelog]
 * Update Requests library 2.7.0 (ab1f493) to 2.7.0 (8b5e457)
diff --git a/gui/slick/css/style.css b/gui/slick/css/style.css
index 8a6bff57..a58f26c4 100644
--- a/gui/slick/css/style.css
+++ b/gui/slick/css/style.css
@@ -507,6 +507,7 @@ inc_bottom.tmpl
 	width:100%;
 	padding:20px 0;
 	text-align:center;
+	clear:both;
 	font-size:12px
 }
 
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index efa0ece2..f16ef14e 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -585,8 +585,9 @@ class Home(MainHandler):
                 index += 1
             if anime_results:
                 t.showlists.append(['container%s' % index, 'Anime List', anime_results])
-        else:
-            t.showlists.append(['container%s' % index, 'Show List', sickbeard.showList])
+
+        if 0 == len(t.showlists):
+            t.showlists.append(['container0', 'Show List', sickbeard.showList])
 
         if 'simple' != sickbeard.HOME_LAYOUT:
             t.network_images = {}