diff --git a/ext/bg/js/yomichan.js b/ext/bg/js/yomichan.js
index e8956057..6cb7d415 100644
--- a/ext/bg/js/yomichan.js
+++ b/ext/bg/js/yomichan.js
@@ -161,11 +161,15 @@ class Yomichan {
                     break;
                 case 'glossary-list':
                     if (definition.glossary) {
-                        value = '<ol style="text-align: left;">';
-                        for (const gloss of definition.glossary) {
-                            value += `<li>${gloss}</li>`;
+                        if (definition.glossary.length > 1) {
+                            value = '<ol style="white-space: pre; text-align: left;">';
+                            for (const gloss of definition.glossary) {
+                                value += `<li>${gloss}</li>`;
+                            }
+                            value += '</ol>';
+                        } else {
+                            value = `<p style="white-space: pre;">${definition.glossary.join('')}</p>`;
                         }
-                        value += '</ol>';
                     }
                     break;
                 case 'tags':
diff --git a/ext/fg/css/frame.css b/ext/fg/css/frame.css
index d519d4b7..8b8172f7 100644
--- a/ext/fg/css/frame.css
+++ b/ext/fg/css/frame.css
@@ -114,7 +114,9 @@ body {
 }
 
 .term-glossary li span {
-    color: #000;
+    color:       #000;
+    overflow-x:  auto;
+    white-space: pre;
 }
 
 .term-glossary p {
@@ -156,7 +158,9 @@ body {
 }
 
 .kanji-glossary li span {
-    color: #000;
+    color:       #000;
+    overflow-x:  auto;
+    white-space: pre;
 }
 
 .kanji-glossary p {