diff --git a/core/ui/ControlPanel/Advanced/Settings/NavigationAddressBar.tid b/core/ui/ControlPanel/Advanced/Settings/NavigationAddressBar.tid
index 3a4c98475..bc218eecb 100644
--- a/core/ui/ControlPanel/Advanced/Settings/NavigationAddressBar.tid
+++ b/core/ui/ControlPanel/Advanced/Settings/NavigationAddressBar.tid
@@ -3,28 +3,11 @@ tags: $:/tags/ControlPanel/Advanced/Settings
 caption: {{$:/language/ControlPanel/Advanced/Settings/NavigationAddressBar/Caption}}
 
 \define lingo-base() $:/language/ControlPanel/Advanced/Settings/NavigationAddressBar/
-<<lingo Hint>>
-<$button popup=<<qualify "$:/state/navaddressbarpopup">> class="btn-invisible btn-dropdown">
-<$view tiddler="$:/config/Navigation/UpdateAddressBar" field="text"/>:
-<$reveal state="$:/config/Navigation/UpdateAddressBar" type="match" text="no">
-''<<lingo No/Description>>''
-</$reveal>
-<$reveal state="$:/config/Navigation/UpdateAddressBar" type="match" text="permalink">
-''<<lingo Permalink/Description>>''
-</$reveal>
-<$reveal state="$:/config/Navigation/UpdateAddressBar" type="match" text="permaview">
-''<<lingo Permaview/Description>>''
-</$reveal>
-{{$:/core/images/down-arrow}}
-</$button>
-<$reveal state=<<qualify "$:/state/navaddressbarpopup">> type="popup" position="below" animate="yes" default="">
-<$linkcatcher to="$:/config/Navigation/UpdateAddressBar">
-<div class="tw-drop-down tw-edit-type-dropdown">
-<$list filter="no permalink permaview">
-<$link to={{!!title}}>
-<$view field="title"/>
-</$link>
-</$list>
-</div>
-</$linkcatcher>
-</$reveal>
+
+<$link to="$:/config/Navigation/UpdateAddressBar"><<lingo Hint>></$link>
+
+<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="permaview"> <<lingo Permaview/Description>> </$radio>
+
+<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="permalink"> <<lingo Permalink/Description>> </$radio>
+
+<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="no"> <<lingo No/Description>> </$radio>
diff --git a/core/ui/ControlPanel/Advanced/Settings/NavigationHistory.tid b/core/ui/ControlPanel/Advanced/Settings/NavigationHistory.tid
index 451771b2c..b4c004d05 100644
--- a/core/ui/ControlPanel/Advanced/Settings/NavigationHistory.tid
+++ b/core/ui/ControlPanel/Advanced/Settings/NavigationHistory.tid
@@ -3,25 +3,8 @@ tags: $:/tags/ControlPanel/Advanced/Settings
 caption: {{$:/language/ControlPanel/Advanced/Settings/NavigationHistory/Caption}}
 
 \define lingo-base() $:/language/ControlPanel/Advanced/Settings/NavigationHistory/
-<<lingo Hint>>
-<$button popup=<<qualify "$:/state/navhistorypopup">> class="btn-invisible btn-dropdown">
-<$view tiddler="$:/config/Navigation/UpdateHistory" field="text"/>:
-<$reveal state="$:/config/Navigation/UpdateHistory" type="match" text="no">
-''<<lingo No/Description>>''
-</$reveal>
-<$reveal state="$:/config/Navigation/UpdateHistory" type="match" text="yes">
-''<<lingo Yes/Description>>''
-</$reveal>
-{{$:/core/images/down-arrow}}
-</$button>
-<$reveal state=<<qualify "$:/state/navhistorypopup">> type="popup" position="below" animate="yes" default="">
-<$linkcatcher to="$:/config/Navigation/UpdateHistory">
-<div class="tw-drop-down tw-edit-type-dropdown">
-<$list filter="no yes">
-<$link to={{!!title}}>
-<$view field="title"/>
-</$link>
-</$list>
-</div>
-</$linkcatcher>
-</$reveal>
+<$link to="$:/config/Navigation/UpdateHistory"><<lingo Hint>></$link>
+
+<$radio tiddler="$:/config/Navigation/UpdateHistory" value="yes"> <<lingo Yes/Description>> </$radio>
+
+<$radio tiddler="$:/config/Navigation/UpdateHistory" value="no"> <<lingo No/Description>> </$radio>