diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java
index 67620ff4e9..152d986a35 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java	
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java	
@@ -951,8 +951,8 @@ protected void create (DeviceData data) {
 	checkDisplay (thread = Thread.currentThread (), true);
 	if (DPIUtil.isMonitorSpecificScalingActive()) {
 		setMonitorSpecificScaling(true);
-		DPIUtil.setMonitorSpecificScaling(true);
 	}
+	DPIUtil.setMonitorSpecificScaling(DPIUtil.isMonitorSpecificScalingActive());
 	Win32DPIUtils.initializeCustomDpiAwareness();
 	createDisplay (data);
 	register (this);
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllNonBrowserTests_AutoscaleOsNonDefaults.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllNonBrowserTests_AutoscaleOsNonDefaults.java
index 5a6dab4a8b..7a8ad71889 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllNonBrowserTests_AutoscaleOsNonDefaults.java	
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllNonBrowserTests_AutoscaleOsNonDefaults.java	
@@ -22,20 +22,21 @@
 @NonBrowserTestSuite
 public class AllNonBrowserTests_AutoscaleOsNonDefaults extends AllNonBrowserTests {
 
+	private static final String AUTO_SCALE_PROPERTY = "swt.autoScale";
 	private static boolean originalMonitorSpecificScalingActive;
 
 	@SuppressWarnings("restriction")
 	@BeforeSuite
 	static void setNonDefaultAutoscale() {
 		originalMonitorSpecificScalingActive = DPIUtil.isMonitorSpecificScalingActive();
-		System.setProperty("swt.autoScale", "quarter");
-		DPIUtil.setMonitorSpecificScaling(true);
+		System.setProperty(AUTO_SCALE_PROPERTY, originalMonitorSpecificScalingActive ? "integer" : "quarter");
+		DPIUtil.setMonitorSpecificScaling(!originalMonitorSpecificScalingActive);
 	}
 
 	@SuppressWarnings("restriction")
 	@AfterSuite
 	static void restoreDefaultAutoscale() {
-		System.clearProperty("swt.autoScale");
+		System.clearProperty(AUTO_SCALE_PROPERTY);
 		DPIUtil.setMonitorSpecificScaling(originalMonitorSpecificScalingActive);
 	}