diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 37c49ec56..193a03eb2 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -1029,9 +1029,9 @@ button.tc-btn-invisible.tc-remove-tag-button {
 		padding: 71px 0 28px <<get.theme.metric sidebarpadding>>;
 	}
 
-	.tc-sidebar-left .tc-sidebar-scrollable {
+	html[dir="rtl"] .tc-sidebar-left .tc-sidebar-scrollable, .tc-sidebar-left .tc-sidebar-scrollable {
 		left: 0;
-		right: clamp(calc(<<get.theme.metric storyleft>> + <<get.theme.metric storyminwidth>>),<<get.theme.metric storyright>>,calc(100% - <<get.theme.metric sidebarminwidth>> + <<get.theme.metric sidebarpadding>>));
+		right: clamp(calc(<<get.theme.metric storyleft>> + <<get.theme.metric storyminwidth>>),calc(<<get.theme.metric storyright>> + <<get.theme.metric storyleft>>),calc(100% - <<get.theme.metric sidebarminwidth>> + <<get.theme.metric storyleft>> + <<get.theme.metric sidebarpadding>>));
 		margin: 0 -<<get.theme.metric sidebarpadding>> 0 0;
 		z-index: 1;
 	}
@@ -1041,11 +1041,6 @@ button.tc-btn-invisible.tc-remove-tag-button {
 		padding-left: 0;
 	}
 
-	html[dir="rtl"] .tc-sidebar-scrollable:not(.tc-sidebar-left .tc-sidebar-scrollable) {
-		padding-right: <<get.theme.metric sidebarpadding>>;
-		padding-left: 0;
-	}
-
 	.tc-story-river {
 		left: max(0px,{{$:/themes/tiddlywiki/vanilla/metrics/storyleft}});
 		right: clamp(calc(<<get.theme.metric storyminwidth>> - <<get.theme.metric storyleft>>),calc(100% - <<get.theme.metric storywidth>>),calc(100% - <<get.theme.metric sidebarminwidth>>));