diff --git a/core/ui/PageControls/savewiki.tid b/core/ui/PageControls/savewiki.tid
index f29797668..a299bcb88 100644
--- a/core/ui/PageControls/savewiki.tid
+++ b/core/ui/PageControls/savewiki.tid
@@ -4,7 +4,7 @@ caption: {{$:/core/images/save-button}} {{$:/language/Buttons/SaveWiki/Caption}}
 description: {{$:/language/Buttons/SaveWiki/Hint}}
 
 <$button tooltip={{$:/language/Buttons/SaveWiki/Hint}} aria-label={{$:/language/Buttons/SaveWiki/Caption}} class=<<tv-config-toolbar-class>>>
-<$wikify name="site-title" text="{{$:/SiteTitle}}.html">
+<$wikify name="site-title" text={{$:/config/SaveWikiButton/Filename}}>
 <$action-sendmessage $message="tm-save-wiki" $param={{$:/config/SaveWikiButton/Template}} filename=<<site-title>>/>
 </$wikify>
 <span class="tc-dirty-indicator">
diff --git a/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting SaveWikiButton Filename.tid b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting SaveWikiButton Filename.tid
new file mode 100644
index 000000000..4d56d03e2
--- /dev/null
+++ b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting SaveWikiButton Filename.tid	
@@ -0,0 +1,13 @@
+created: 20181215154811835
+modified: 20181215154811835
+tags: [[Hidden Settings]]
+title: Hidden Setting: Filename for Save Wiki Button
+type: text/vnd.tiddlywiki
+
+<<.from-version "5.1.19">> This value is wikified to determine the filename when saving via the "save wiki" page control button.
+
+By default, this setting is empty, which triggers the default handling where the filename portion of the URL is used.
+
+The value `{{$:/SiteTitle}}.html` causes the filename to be constructed from the site title with a `.html` extension.
+
+$:/config/SaveWikiButton/Filename
diff --git a/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting SaveWikiButton Template.tid b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting SaveWikiButton Template.tid
new file mode 100644
index 000000000..d70a7730d
--- /dev/null
+++ b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting SaveWikiButton Template.tid	
@@ -0,0 +1,13 @@
+created: 20181215154811835
+modified: 20181215154811835
+tags: [[Hidden Settings]]
+title: Hidden Setting: Template for Save Wiki Button
+type: text/vnd.tiddlywiki
+
+Determines the template used when saving via the "save wiki" page control button.
+
+Defaults to `$:/core/save/all`.
+
+You can change this setting to choose what is saved when the "save wiki" button is clicked.
+
+$:/config/SaveWikiButton/Template