diff --git a/debug.html b/debug.html
index c3c41379..9237350d 100644
--- a/debug.html
+++ b/debug.html
@@ -268,7 +268,7 @@ function load_next()
         <input type="button" value="Disable mouse" id="toggle_mouse">
         <input type="button" value="Lock mouse" id="lock_mouse">
         <input type="button" value="Go fullscreen" id="fullscreen">
-        <input type="button" value="Take screenshot (only graphic modes)" id="take_screenshot">
+        <input type="button" value="Take screenshot" id="take_screenshot">
         <input type="button" value="Mute" id="mute">
 
         <label>
diff --git a/index.html b/index.html
index 8fc3f829..b351c4fa 100644
--- a/index.html
+++ b/index.html
@@ -186,7 +186,7 @@
         <input type="button" value="Disable mouse" id="toggle_mouse">
         <input type="button" value="Lock mouse" id="lock_mouse">
         <input type="button" value="Go fullscreen" id="fullscreen">
-        <input type="button" value="Take screenshot (only graphic modes)" id="take_screenshot">
+        <input type="button" value="Take screenshot" id="take_screenshot">
         <input type="button" value="Mute" id="mute">
 
         <label>
diff --git a/src/browser/screen.js b/src/browser/screen.js
index a1a71918..4667519d 100644
--- a/src/browser/screen.js
+++ b/src/browser/screen.js
@@ -112,7 +112,7 @@ function ScreenAdapter(screen_container, bus)
         charmap[i] = String.fromCharCode(chr);
     }
 
-    graphic_context["imageSmoothingEnabled"] = false;
+    graphic_context.imageSmoothingEnabled = false;
 
     cursor_element.style.position = "absolute";
     cursor_element.style.backgroundColor = "#ccc";
@@ -175,9 +175,52 @@ function ScreenAdapter(screen_container, bus)
 
     this.make_screenshot = function()
     {
-        try {
-            const image = new Image();
+        const image = new Image();
+
+        if(is_graphical)
+        {
             image.src = graphic_screen.toDataURL("image/png");
+        }
+        else
+        {
+            // Default 720x400, but can be [8, 16] at 640x400
+            const char_size = [9, 16];
+
+            const canvas = document.createElement("canvas");
+            canvas.width = text_mode_width * char_size[0];
+            canvas.height = text_mode_height * char_size[1];
+            const context = canvas.getContext("2d");
+            context.imageSmoothingEnabled = false;
+            context.font = window.getComputedStyle(text_screen).font;
+            context.textBaseline = "top";
+
+            for(let x = 0; x < text_mode_width; x++)
+            {
+                for(let y = 0; y < text_mode_height; y++)
+                {
+                    const index = (y * text_mode_width + x) * 3;
+                    context.fillStyle = number_as_color(text_mode_data[index + 1]);
+                    context.fillRect(x * char_size[0], y * char_size[1], char_size[0], char_size[1]);
+                    context.fillStyle = number_as_color(text_mode_data[index + 2]);
+                    context.fillText(charmap[text_mode_data[index]], x * char_size[0], y * char_size[1]);
+                }
+            }
+
+            if(cursor_element.style.display !== "none")
+            {
+                context.fillStyle = cursor_element.style.backgroundColor;
+                context.fillRect(
+                    cursor_col * char_size[0],
+                    cursor_row * char_size[1] + parseInt(cursor_element.style.marginTop, 10) - 1,
+                    parseInt(cursor_element.style.width, 10),
+                    parseInt(cursor_element.style.height, 10)
+                );
+            }
+
+            image.src = canvas.toDataURL("image/png");
+        }
+
+        try {
             const w = window.open("");
             w.document.write(image.outerHTML);
         }