diff --git a/core/language/en-GB/ControlPanel.multids b/core/language/en-GB/ControlPanel.multids
index 8330c7101..e7fcd3e24 100644
--- a/core/language/en-GB/ControlPanel.multids
+++ b/core/language/en-GB/ControlPanel.multids
@@ -75,11 +75,10 @@ Plugins/Enable/Hint: Enable this plugin when reloading page
 Plugins/Language/Prompt: Languages
 Plugins/Plugin/Prompt: Plugins
 Plugins/Theme/Prompt: Themes
-Saving/AutoSave/Disabled/Button: enable
-Saving/AutoSave/Disabled/Prompt: Autosave is currently disabled
-Saving/AutoSave/Enabled/Button: disable
-Saving/AutoSave/Enabled/Prompt: Autosave is currently enabled
-Saving/AutoSave: Autosave
+Settings/AutoSave/Disabled/Description: Do not save automatically
+Settings/AutoSave/Enabled/Description: Save changes automatically
+Settings/AutoSave/Caption: Autosave
+Settings/AutoSave/Hint: Automatically save changes during editing
 Saving/Caption: Saving
 Saving/Heading: Saving
 Saving/TiddlySpot/Advanced/Heading: Advanced Settings
diff --git a/core/ui/ControlPanel/Saving.tid b/core/ui/ControlPanel/Saving.tid
index 6c8aab42c..ed3a7932a 100644
--- a/core/ui/ControlPanel/Saving.tid
+++ b/core/ui/ControlPanel/Saving.tid
@@ -13,10 +13,6 @@ http://$(userName)$.tiddlyspot.com/backup/
 </$set>
 </$reveal>
 \end
-! <<lingo Heading>>
-
-|<<lingo AutoSave>> |{{$:/snippets/autosavestatus}} |
-
 ! <<lingo TiddlySpot/Heading>>
 
 |<<lingo TiddlySpot/UserName>> |<$edit-text tiddler="$:/UploadName" default="" tag="input"/> |
diff --git a/core/ui/ControlPanel/Settings/AutoSave.tid b/core/ui/ControlPanel/Settings/AutoSave.tid
new file mode 100644
index 000000000..70d00b8e1
--- /dev/null
+++ b/core/ui/ControlPanel/Settings/AutoSave.tid
@@ -0,0 +1,11 @@
+title: $:/core/ui/ControlPanel/Settings/AutoSave
+tags: $:/tags/ControlPanel/Settings
+caption: {{$:/language/ControlPanel/Settings/AutoSave/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/Settings/AutoSave/
+
+<$link to="$:/config/AutoSave"><<lingo Hint>></$link>
+
+<$radio tiddler="$:/config/AutoSave" value="yes"> <<lingo Enabled/Description>> </$radio>
+
+<$radio tiddler="$:/config/AutoSave" value="no"> <<lingo Disabled/Description>> </$radio>
diff --git a/core/wiki/autosavestatus.tid b/core/wiki/autosavestatus.tid
deleted file mode 100644
index edbc68ed7..000000000
--- a/core/wiki/autosavestatus.tid
+++ /dev/null
@@ -1,12 +0,0 @@
-title: $:/snippets/autosavestatus
-
-\define lingo-base() $:/language/ControlPanel/Saving/
-<$reveal type="match" state="$:/config/AutoSave" text="yes">
-<<lingo AutoSave/Enabled/Prompt>>
-<$linkcatcher to="$:/config/AutoSave"><$button to="no"><<lingo AutoSave/Enabled/Button>>
-</$button></$linkcatcher>
-</$reveal>
-<$reveal type="nomatch" state="$:/config/AutoSave" text="yes">
-<<lingo AutoSave/Disabled/Prompt>>
-<$linkcatcher to="$:/config/AutoSave"><$button to="yes"><<lingo AutoSave/Disabled/Button>></$button></$linkcatcher>
-</$reveal>
\ No newline at end of file