diff --git a/core/ui/ControlPanel/Advanced/Settings/NavigationAddressBar.tid b/core/ui/ControlPanel/Advanced/Settings/NavigationAddressBar.tid
index 6f59f5d5f..3a4c98475 100644
--- a/core/ui/ControlPanel/Advanced/Settings/NavigationAddressBar.tid
+++ b/core/ui/ControlPanel/Advanced/Settings/NavigationAddressBar.tid
@@ -4,7 +4,6 @@ caption: {{$:/language/ControlPanel/Advanced/Settings/NavigationAddressBar/Capti
 
 \define lingo-base() $:/language/ControlPanel/Advanced/Settings/NavigationAddressBar/
 <<lingo Hint>>
-<div style="position:relative;">
 <$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">
@@ -18,10 +17,9 @@ caption: {{$:/language/ControlPanel/Advanced/Settings/NavigationAddressBar/Capti
 </$reveal>
 {{$:/core/images/down-arrow}}
 </$button>
-<div class="tw-block-dropdown-wrapper">
 <$reveal state=<<qualify "$:/state/navaddressbarpopup">> type="popup" position="below" animate="yes" default="">
 <$linkcatcher to="$:/config/Navigation/UpdateAddressBar">
-<div class="tw-block-dropdown tw-edit-type-dropdown">
+<div class="tw-drop-down tw-edit-type-dropdown">
 <$list filter="no permalink permaview">
 <$link to={{!!title}}>
 <$view field="title"/>
@@ -30,5 +28,3 @@ caption: {{$:/language/ControlPanel/Advanced/Settings/NavigationAddressBar/Capti
 </div>
 </$linkcatcher>
 </$reveal>
-</div>
-</div>
diff --git a/core/ui/ControlPanel/Advanced/Settings/NavigationHistory.tid b/core/ui/ControlPanel/Advanced/Settings/NavigationHistory.tid
index 9735df59d..451771b2c 100644
--- a/core/ui/ControlPanel/Advanced/Settings/NavigationHistory.tid
+++ b/core/ui/ControlPanel/Advanced/Settings/NavigationHistory.tid
@@ -4,7 +4,6 @@ caption: {{$:/language/ControlPanel/Advanced/Settings/NavigationHistory/Caption}
 
 \define lingo-base() $:/language/ControlPanel/Advanced/Settings/NavigationHistory/
 <<lingo Hint>>
-<div style="position:relative;">
 <$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">
@@ -15,10 +14,9 @@ caption: {{$:/language/ControlPanel/Advanced/Settings/NavigationHistory/Caption}
 </$reveal>
 {{$:/core/images/down-arrow}}
 </$button>
-<div class="tw-block-dropdown-wrapper">
 <$reveal state=<<qualify "$:/state/navhistorypopup">> type="popup" position="below" animate="yes" default="">
 <$linkcatcher to="$:/config/Navigation/UpdateHistory">
-<div class="tw-block-dropdown tw-edit-type-dropdown">
+<div class="tw-drop-down tw-edit-type-dropdown">
 <$list filter="no yes">
 <$link to={{!!title}}>
 <$view field="title"/>
@@ -27,5 +25,3 @@ caption: {{$:/language/ControlPanel/Advanced/Settings/NavigationHistory/Caption}
 </div>
 </$linkcatcher>
 </$reveal>
-</div>
-</div>