diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e7b90e6..f7cae75f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Fixed
 
+- Code blocks are rendered incorrectly in RTL languages ([#164](https://github.com/jpanther/congo/issues/164))
 - Scroll to top link overlaps footer menu on mobile devices when there are several links ([#172](https://github.com/jpanther/congo/issues/172))
 
 ### Removed
diff --git a/assets/js/rtl.js b/assets/js/rtl.js
new file mode 100644
index 00000000..26852d47
--- /dev/null
+++ b/assets/js/rtl.js
@@ -0,0 +1,3 @@
+window.addEventListener("DOMContentLoaded", (event) => {
+  document.querySelectorAll("pre, .highlight-wrapper").forEach((tag) => (tag.dir = "auto"));
+});
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index c78bd371..d36cda4f 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -62,6 +62,10 @@
     {{ $jsCode := resources.Get "js/code.js" }}
     {{ $assets.Add "js" (slice $jsCode) }}
   {{ end }}
+  {{ if .Site.Params.rtl | default false }}
+    {{ $jsRTL := resources.Get "js/rtl.js" }}
+    {{ $assets.Add "js" (slice $jsRTL) }}
+  {{ end }}
   {{ if $assets.Get "js" }}
     {{ $bundleJS := $assets.Get "js" | resources.Concat "js/main.bundle.js" | resources.Minify | resources.Fingerprint "sha512" }}
     <script defer type="text/javascript" id="script-bundle" src="{{ $bundleJS.RelPermalink }}" integrity="{{ $bundleJS.Data.Integrity }}" data-copy="{{ i18n "code.copy" }}" data-copied="{{ i18n "code.copied" }}"></script>