diff --git a/source/css/_common/scaffolding/tables.styl b/source/css/_common/scaffolding/tables.styl
index a563abcef2..91ae458213 100644
--- a/source/css/_common/scaffolding/tables.styl
+++ b/source/css/_common/scaffolding/tables.styl
@@ -4,6 +4,10 @@
   -webkit-overflow-scrolling: touch;
 }
 
+.highlight .table-container {
+  margin: 0px;
+}
+
 table {
   width: $table-width;
   border-collapse: collapse;
diff --git a/source/js/utils.js b/source/js/utils.js
index c7f3de45d8..df3aeb5407 100644
--- a/source/js/utils.js
+++ b/source/js/utils.js
@@ -298,7 +298,7 @@ NexT.utils = NexT.$u = {
 $(document).ready(function() {
 
   function wrapTable() {
-    $('table').not('figure table').wrap('<div class="table-container"></div>');
+    $('table').wrap('<div class="table-container"></div>');
   }
 
   /**