diff --git a/gui/slick/interfaces/default/home_trendingShows.tmpl b/gui/slick/interfaces/default/home_trendingShows.tmpl
index df9664f0..268f4c7a 100644
--- a/gui/slick/interfaces/default/home_trendingShows.tmpl
+++ b/gui/slick/interfaces/default/home_trendingShows.tmpl
@@ -14,12 +14,18 @@
 #import os.path
 #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl')
 
+<script type="text/javascript" src="$sbRoot/js/rootDirs.js?$sbPID"></script>
 <script type="text/javascript" src="$sbRoot/js/plotTooltip.js?$sbPID"></script>
 
 <script type="text/javascript" charset="utf-8">
 <!--
 
 \$(document).ready(function(){
+    \$( "#tabs" ).tabs({
+        collapsible: true,
+        selected: #if $sickbeard.ROOT_DIRS then '-1' else '0'#
+    });
+
     // initialise combos for dirty page refreshes
     \$('#showsort').val('original');
     \$('#showsortdirection').val('asc');
@@ -85,7 +91,19 @@
 #end if
 
 #if $trending_shows
-<div class="pull-right" style="margin-top: -40px;">
+<div id="tabs">
+    <ul>
+        <li><a href="#tabs-1">Manage Directories</a></li>
+        <li><a href="#tabs-2">Customize Options</a></li>
+    </ul>
+    <div id="tabs-1" class="existingtabs">
+        #include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_rootDirs.tmpl")
+    </div>
+    <div id="tabs-2" class="existingtabs">
+        #include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_addShowOptions.tmpl")
+    </div>
+    <br>
+
 	<span>Sort By:</span>
 	<select id="showsort" class="form-control form-control-inline input-sm">
 		<option value="name">Name</option>
diff --git a/gui/slick/js/rootDirs.js b/gui/slick/js/rootDirs.js
index f2b461f5..b4826dbe 100644
--- a/gui/slick/js/rootDirs.js
+++ b/gui/slick/js/rootDirs.js
@@ -40,8 +40,8 @@ $(document).ready(function() {
         if (is_default)
             setDefault($('#rootDirs option').attr('id'));
 
-        $.get(sbRoot+'/config/general/saveRootDirs', { rootDirString: $('#rootDirText').val() });
         refreshRootDirs();
+        $.get(sbRoot+'/config/general/saveRootDirs', { rootDirString: $('#rootDirText').val() });
     }
 
     function editRootDir(path) {
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index f1762027..1199dd5f 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -1462,7 +1462,6 @@ class ConfigGeneral(MainHandler):
     def saveRootDirs(self, rootDirString=None):
         sickbeard.ROOT_DIRS = rootDirString
 
-
     def saveAddShowDefaults(self, defaultStatus, anyQualities, bestQualities, defaultFlattenFolders, subtitles=False,
                             anime=False, scene=False):
 
@@ -3036,7 +3035,7 @@ class NewHomeAddShows(MainHandler):
             ui.notifications.message('Show added', 'Adding the specified show into ' + show_dir)
         else:
             logger.log(u"There was an error creating the show, no root directory setting found", logger.ERROR)
-            return
+            return "No root directories setup, please go back and add one."
 
         # done adding show
         redirect('/home/')