diff --git a/core/ui/TagManager.tid b/core/ui/TagManager.tid
index 75daf840f..867a27c2e 100644
--- a/core/ui/TagManager.tid
+++ b/core/ui/TagManager.tid
@@ -62,7 +62,6 @@ color: #bbb
 \end
 
 \whitespace trim
-<div class="tc-table-wrapper">
 <table class="tc-tag-manager-table">
 <tbody>
 	<tr>
@@ -116,5 +115,4 @@ color: #bbb
 		<td></td>
 	</tr>
 </tbody>
-</table>
-</div>
\ No newline at end of file
+</table>
\ No newline at end of file
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index c13b69f9b..2d31dd633 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -2793,20 +2793,11 @@ a.tc-tiddlylink.tc-plugin-info:hover > .tc-plugin-info-chunk .tc-plugin-info-sta
 	display: table;
 }
 
-/* Fix overflow in table and toc */
-.tc-tiddler-body .tc-tabbed-table-of-contents {
+/* Fix overflow toc, manager and testcase output */
+.tc-tiddler-body .tc-tabbed-table-of-contents, .tc-manager-list-item-content, .tc-test-case-output {
 	overflow-x: auto;
 }
 
-.tc-tiddler-body > table {
-  display: block;
-  overflow: auto;
-}
-.tc-tiddler-body > table tbody {
-  display: table;
-  width: 100%;
-}
-
 /* A wrapper to fix table overflow */
 
 .tc-table-wrapper {