diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp
index e4d8b2bc5..8e4832c07 100644
--- a/es-app/src/PlatformId.cpp
+++ b/es-app/src/PlatformId.cpp
@@ -103,7 +103,7 @@ namespace PlatformIds
         "pcengine",             // NEC PC Engine / TurboGrafx-16
         "pcenginecd",           // NEC PC Engine CD / TurboGrafx-CD
         "pcfx",                 // NEC PC-FX
-        "pcwindows",            // PC (Windows)
+        "pcwindows",            // Microsoft Windows
         "pico8",                // PICO-8 Fantasy Console
         "pokemini",             // Nintendo Pokémon Mini
         "ps2",                  // Sony PlayStation 2
@@ -145,6 +145,7 @@ namespace PlatformIds
         "wasm4",                // WASM-4 Fantasy Console
         "wii",                  // Nintendo Wii
         "wiiu",                 // Nintendo Wii U
+        "windows3x",            // Microsoft Windows 3.x
         "wonderswan",           // Bandai WonderSwan
         "wonderswancolor",      // Bandai WonderSwan Color
         "x1",                   // Sharp X1
diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h
index 4c2cc5551..ac6e9f951 100644
--- a/es-app/src/PlatformId.h
+++ b/es-app/src/PlatformId.h
@@ -102,7 +102,7 @@ namespace PlatformIds
         NEC_PC_ENGINE,
         NEC_PC_ENGINE_CD,
         NEC_PCFX,
-        PC_WINDOWS,
+        MICROSOFT_WINDOWS,
         GAMEENGINE_PICO8,
         NINTENDO_POKEMON_MINI,
         SONY_PLAYSTATION_2,
@@ -144,6 +144,7 @@ namespace PlatformIds
         GAMEENGINE_WASM4,
         NINTENDO_WII,
         NINTENDO_WII_U,
+        MICROSOFT_WINDOWS_3X,
         BANDAI_WONDERSWAN,
         BANDAI_WONDERSWAN_COLOR,
         SHARP_X1,
diff --git a/es-app/src/scrapers/GamesDBJSONScraper.cpp b/es-app/src/scrapers/GamesDBJSONScraper.cpp
index ffa7d881c..caa9f2fde 100644
--- a/es-app/src/scrapers/GamesDBJSONScraper.cpp
+++ b/es-app/src/scrapers/GamesDBJSONScraper.cpp
@@ -104,7 +104,8 @@ namespace
         {TANGERINE_ORIC, "4986"},
         {GAMEENGINE_SCUMMVM, "1"},
         {PC, "1"},
-        {PC_WINDOWS, "1"},
+        {MICROSOFT_WINDOWS, "1"},
+        {MICROSOFT_WINDOWS_3X, "1"},
         {VALVE_STEAM, "1"},
         {NEC_PCFX, "4930"},
         {PHILIPS_CDI, "4917"},
diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp
index 51f8f4380..00eaace07 100644
--- a/es-app/src/scrapers/ScreenScraper.cpp
+++ b/es-app/src/scrapers/ScreenScraper.cpp
@@ -103,7 +103,8 @@ namespace
         {DRAGON32, 91},
         {DOS, 135},
         {PC, 135},
-        {PC_WINDOWS, 138},
+        {MICROSOFT_WINDOWS, 138},
+        {MICROSOFT_WINDOWS_3X, 136},
         {VALVE_STEAM, 138},
         {NEC_PCFX, 72},
         {GAMEENGINE_PICO8, 234},
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index af1afeed9..fcb32baee 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -1820,6 +1820,17 @@
         <platform>pcwindows</platform>
         <theme>windows</theme>
     </system>
+    <system>
+        <name>windows3x</name>
+        <fullname>Microsoft Windows 3.x</fullname>
+        <path>%ROMPATH%/windows3x</path>
+        <extension>.app .bat .BAT .sh</extension>
+        <command label="DOSBox-X (Standalone)">%STARTDIR%=%GAMEDIR% %EMULATOR_DOSBOX-X% -defaultdir %GAMEDIR% %ROM%</command>
+        <command label="Shortcut or script (Suspend ES-DE)">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <command label="Shortcut or script (Keep ES-DE running)">%RUNINBACKGROUND% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <platform>windows3x</platform>
+        <theme>windows3x</theme>
+    </system>
     <system>
         <name>wonderswan</name>
         <fullname>Bandai WonderSwan</fullname>
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index 0f085911a..a52bb706f 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -1901,6 +1901,19 @@
         <platform>pcwindows</platform>
         <theme>windows</theme>
     </system>
+    <system>
+        <name>windows3x</name>
+        <fullname>Microsoft Windows 3.x</fullname>
+        <path>%ROMPATH%/windows3x</path>
+        <extension>.AppImage .bat .BAT .desktop .sh</extension>
+        <command label="DOSBox-X (Standalone)">%STARTDIR%=%GAMEDIR% %EMULATOR_DOSBOX-X% -defaultdir %GAMEDIR% %ROM%</command>
+        <command label="Shortcut or script (Suspend ES-DE)">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <command label="Shortcut or script (Keep ES-DE running)">%RUNINBACKGROUND% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <command label="AppImage (Suspend ES-DE)">%EMULATOR_OS-SHELL% -c "%ROM%"</command>
+        <command label="AppImage (Keep ES-DE running)">%RUNINBACKGROUND% %EMULATOR_OS-SHELL% -c "%ROM%"</command>
+        <platform>windows3x</platform>
+        <theme>windows3x</theme>
+    </system>
     <system>
         <name>wonderswan</name>
         <fullname>Bandai WonderSwan</fullname>
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index a781a7fca..a787784bd 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -1895,6 +1895,17 @@
         <platform>pcwindows</platform>
         <theme>windows</theme>
     </system>
+    <system>
+        <name>windows3x</name>
+        <fullname>Microsoft Windows 3.x</fullname>
+        <path>%ROMPATH%\windows3x</path>
+        <extension>.bat .BAT .lnk .LNK</extension>
+        <command label="DOSBox-X (Standalone)">%STARTDIR%=%GAMEDIR% %EMULATOR_DOSBOX-X% -defaultdir %GAMEDIR% %ROM%</command>
+        <command label="Shortcut or script (Suspend ES-DE)">%HIDEWINDOW% %ESCAPESPECIALS% %EMULATOR_OS-SHELL% /C %ROM%</command>
+        <command label="Shortcut or script (Keep ES-DE running)">%HIDEWINDOW% %ESCAPESPECIALS% %RUNINBACKGROUND% %EMULATOR_OS-SHELL% /C %ROM%</command>
+        <platform>windows3x</platform>
+        <theme>windows3x</theme>
+    </system>
     <system>
         <name>wonderswan</name>
         <fullname>Bandai WonderSwan</fullname>