diff --git a/CHANGES.md b/CHANGES.md
index b1176d2..bfed282 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,7 @@
 ### 0.20.0 (2019-xx-xx xx:xx:xx UTC)
 
+* Add "Use dots in show.name path" to config/General/Misc, this will only affect newly added shows
+* Change displayed folder on add show page to update based on "Use dots in show.name path" setting
 * Update attr 18.3.0.dev0 (55642b3) to 19.2.0.dev0 (de84609) 
 * Update Beautiful Soup 4.6.3 (r475) to 4.7.1 (r497)
 * Add soupsieve 1.9.1 (24859cc)
diff --git a/gui/slick/interfaces/default/config_general.tmpl b/gui/slick/interfaces/default/config_general.tmpl
index 429897f..9de1797 100644
--- a/gui/slick/interfaces/default/config_general.tmpl
+++ b/gui/slick/interfaces/default/config_general.tmpl
@@ -151,6 +151,16 @@
 							</label>
 						</div>
 
+						<div class="field-pair">
+							<label for="show_dirs_with_dots">
+								<span class="component-title">Use dots in show.name path</span>
+								<span class="component-desc">
+									<input type="checkbox" name="show_dirs_with_dots" id="show_dirs_with_dots"#echo ('', $checked)[$sg_var('SHOW_DIRS_WITH_DOTS')]#>
+									<p>or use space i.e. "show name" (default:unset)</p>
+								</span>
+							</label>
+						</div>
+
 						<input type="submit" class="btn config_submitter" value="Save Changes">
 					</fieldset>
 				</div>
diff --git a/gui/slick/js/newShow.js b/gui/slick/js/newShow.js
index 6c83a32..5667352 100644
--- a/gui/slick/js/newShow.js
+++ b/gui/slick/js/newShow.js
@@ -376,7 +376,7 @@ $(document).ready(function () {
 
 		// if we have a show name then sanitize and use it for the dir name
 		if (show_name.length) {
-			$.get(sbRoot + '/home/addShows/sanitizeFileName', {name: cleanseText(show_name, !1)}, function (data) {
+			$.get(sbRoot + '/home/addShows/generate_show_dir_name', {show_name: cleanseText(show_name, !1)}, function (data) {
 				$('#displayText').html(sample_text.replace('||', data));
 			});
 		// if not then it's unknown
diff --git a/sickbeard/helpers.py b/sickbeard/helpers.py
index 74a547f..14faf1e 100644
--- a/sickbeard/helpers.py
+++ b/sickbeard/helpers.py
@@ -1836,4 +1836,6 @@ def generate_show_dir_name(root_dir, show_name):
     san_show_name = sanitizeFileName(show_name)
     if sickbeard.SHOW_DIRS_WITH_DOTS:
         san_show_name = san_show_name.replace(' ', '.')
+    if None is root_dir:
+        return san_show_name
     return ek.ek(os.path.join, root_dir, san_show_name)
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index 5b8d546..b2ce5d2 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -3026,6 +3026,10 @@ class NewHomeAddShows(Home):
     def sanitizeFileName(self, name):
         return helpers.sanitizeFileName(name)
 
+    @staticmethod
+    def generate_show_dir_name(show_name):
+        return helpers.generate_show_dir_name(None, show_name)
+
     # noinspection PyPep8Naming
     def searchIndexersForShowName(self, search_term, lang='en', indexer=None):
         if not lang or 'null' == lang:
@@ -5880,8 +5884,8 @@ class ConfigGeneral(Config):
                     home_search_focus=None, display_freespace=None, sort_article=None, auto_update=None, notify_on_update=None,
                     proxy_setting=None, proxy_indexers=None, anon_redirect=None, git_path=None, git_remote=None, calendar_unprotected=None,
                     fuzzy_dating=None, trim_zero=None, date_preset=None, date_preset_na=None, time_preset=None,
-                    indexer_timeout=None, rootDir=None, theme_name=None, default_home=None, use_imdb_info=None,
-                    fanart_limit=None, show_tags=None, showlist_tagview=None):
+                    indexer_timeout=None, rootDir=None, show_dirs_with_dots=None, theme_name=None, default_home=None,
+                    use_imdb_info=None, fanart_limit=None, show_tags=None, showlist_tagview=None):
 
         results = []
 
@@ -5904,6 +5908,7 @@ class ConfigGeneral(Config):
                 sickbeard.INDEXER_DEFAULT = INDEXER_TVDB
         if indexer_timeout:
             sickbeard.INDEXER_TIMEOUT = config.to_int(indexer_timeout)
+        sickbeard.SHOW_DIRS_WITH_DOTS = config.checkbox_to_value(show_dirs_with_dots)
 
         # Updates
         config.schedule_version_notify(config.checkbox_to_value(version_notify))