diff --git a/docs/tr2/CHANGELOG.md b/docs/tr2/CHANGELOG.md
index 523632830..f65859034 100644
--- a/docs/tr2/CHANGELOG.md
+++ b/docs/tr2/CHANGELOG.md
@@ -11,7 +11,7 @@
     - removed unused detail level option
     - removed triple buffering option
     - removed dither option
-- added toggle wireframe option (available with /set console command)
+- added toggle wireframe option (available with `/set` console command and with Shift+F7)
 - added support for custom levels to enforce values for any config setting (#1846)
 - added an option to fix inventory item usage duplication (#1586)
 - added optional automatic key/puzzle inventory item pre-selection (#1884)
diff --git a/src/tr2/game/shell/input.c b/src/tr2/game/shell/input.c
index 13175c8f2..f34a2710d 100644
--- a/src/tr2/game/shell/input.c
+++ b/src/tr2/game/shell/input.c
@@ -53,7 +53,12 @@ static void M_TogglePerspectiveCorrection(void)
 
 static void M_ToggleZBuffer(void)
 {
-    g_Config.rendering.enable_zbuffer = !g_Config.rendering.enable_zbuffer;
+    if (g_Input.slow) {
+        g_Config.rendering.enable_wireframe =
+            !g_Config.rendering.enable_wireframe;
+    } else {
+        g_Config.rendering.enable_zbuffer = !g_Config.rendering.enable_zbuffer;
+    }
     Overlay_DisplayModeInfo(
         g_Config.rendering.enable_zbuffer ? "Z-Buffer On" : "Z-Buffer Off");
     Config_Write();