diff --git a/Generals/Code/Main/CMakeLists.txt b/Generals/Code/Main/CMakeLists.txt
index 3c435234cb..a01744f984 100644
--- a/Generals/Code/Main/CMakeLists.txt
+++ b/Generals/Code/Main/CMakeLists.txt
@@ -60,6 +60,13 @@ target_sources(g_generals PRIVATE
 )
 
 if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
+    # VS2005 and later adds default manifest, we need to turn it off to prevent conflict with custom manifest
+    if(NOT IS_VS6_BUILD)
+        target_link_options(g_generals PRIVATE
+            "/MANIFEST:NO"
+        )
+    endif()
+
     target_sources(g_generals PRIVATE
         RTS.RC
     )
diff --git a/Generals/Code/Main/RTS.RC b/Generals/Code/Main/RTS.RC
index 12f25e292f..b4e435f608 100644
--- a/Generals/Code/Main/RTS.RC
+++ b/Generals/Code/Main/RTS.RC
@@ -65,6 +65,8 @@ IDB_LOAD_SCREEN         BITMAP  DISCARDABLE     "Install_Final.bmp"
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 
+// Add manifest to specify that the app is DPI aware and prevent forced scaling by the system
+1 24 "app.manifest"
 
 
 #ifndef APSTUDIO_INVOKED
diff --git a/Generals/Code/Main/app.manifest b/Generals/Code/Main/app.manifest
new file mode 100644
index 0000000000..207a0886b3
--- /dev/null
+++ b/Generals/Code/Main/app.manifest
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level='asInvoker' uiAccess='false' />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+      />
+    </dependentAssembly>
+  </dependency>
+  <asmv3:application>
+    <asmv3:windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/pm</dpiAware>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+</assembly>
diff --git a/GeneralsMD/Code/Main/CMakeLists.txt b/GeneralsMD/Code/Main/CMakeLists.txt
index 4c4f7638bc..fb294fddf3 100644
--- a/GeneralsMD/Code/Main/CMakeLists.txt
+++ b/GeneralsMD/Code/Main/CMakeLists.txt
@@ -61,6 +61,13 @@ target_sources(z_generals PRIVATE
 )
 
 if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
+    # VS2005 and later adds default manifest, we need to turn it off to prevent conflict with custom manifest
+    if(NOT IS_VS6_BUILD)
+        target_link_options(z_generals PRIVATE
+            "/MANIFEST:NO"
+        )
+    endif()
+
     target_sources(z_generals PRIVATE
         RTS.RC
     )
diff --git a/GeneralsMD/Code/Main/RTS.RC b/GeneralsMD/Code/Main/RTS.RC
index a0fb57d2e4..faa4ee857f 100644
--- a/GeneralsMD/Code/Main/RTS.RC
+++ b/GeneralsMD/Code/Main/RTS.RC
@@ -58,6 +58,8 @@ IDI_ApplicationIcon     ICON    DISCARDABLE     "GENERALS.ICO"
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 
+// Add manifest to specify that the app is DPI aware and prevent forced scaling by the system
+1 24 "app.manifest"
 
 
 #ifndef APSTUDIO_INVOKED
diff --git a/GeneralsMD/Code/Main/app.manifest b/GeneralsMD/Code/Main/app.manifest
new file mode 100644
index 0000000000..207a0886b3
--- /dev/null
+++ b/GeneralsMD/Code/Main/app.manifest
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level='asInvoker' uiAccess='false' />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+      />
+    </dependentAssembly>
+  </dependency>
+  <asmv3:application>
+    <asmv3:windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/pm</dpiAware>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+</assembly>