diff --git a/_layouts/wiki.html b/_layouts/wiki.html
index 474c347..ecbd46c 100644
--- a/_layouts/wiki.html
+++ b/_layouts/wiki.html
@@ -53,8 +53,9 @@ layout: compress
 						<h1 class="mb-1">{{ page.long_title | default: page.title }}</h1>
 						<hr class="mt-0">
 						{% if page.layout == "faq" %}
-							{{ content }}
+							{{ content | replace: "<table>", '<div class="table-responsive"><table class="table">' | replace: "</table>", "</table></div>" }}
 						{% else %}
+							{% assign content = content | replace: "<table>", '<div class="table-responsive"><table class="table">' | replace: "</table>", "</table></div>" %}
 							{% include anchor-headings.html html=content anchorBody="<small>#</small>" anchorClass="header-anchor" %}
 						{% endif %}
 						<div class="alert alert-secondary small-alert" role="alert">
diff --git a/_sass/base.scss b/_sass/base.scss
index d909941..2d2d699 100644
--- a/_sass/base.scss
+++ b/_sass/base.scss
@@ -42,10 +42,15 @@ blockquote {
 	background-color: $code-bg;
 	padding: 3px;
 	border-radius: 0.25rem;
-	
+
 	&:not(.wrap) {
 		white-space: nowrap;
+
+		@media screen and (max-width: 576px) {
+			white-space: normal;
+		}
 	}
+
 }
 
 pre {