diff --git a/assets/css/index.css b/assets/css/index.css
index bc2c457b6a..bdbb02f086 100644
--- a/assets/css/index.css
+++ b/assets/css/index.css
@@ -382,7 +382,7 @@ select {
 
 .codetabs.cli > .panel .highlight > .chroma {
     margin: 1rem 1rem 0.1rem 0.1rem;
-    overflow-x: hidden;
+    overflow-x: auto;
     padding-bottom: 0;
 }
 
diff --git a/layouts/partials/tabbed-clients-example.html b/layouts/partials/tabbed-clients-example.html
index 157f033ea2..3c79ea69ce 100644
--- a/layouts/partials/tabbed-clients-example.html
+++ b/layouts/partials/tabbed-clients-example.html
@@ -22,7 +22,7 @@
     {{ $language := index $example "language" }}
     {{ $quickstartSlug := index $clientConfig "quickstartSlug" }}
     
-    {{ if and ($example) (or (eq $lang "") (eq $lang $client)) }}
+    {{ if and ($example) (or (eq $lang "") (strings.Contains $lang $client)) }}
         {{ $examplePath := index $example "target" }}
         {{ $options := printf "linenos=false" }}