diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
index c20ae68a70f..9aa81d2d0c6 100644
--- a/app/src/processing/app/Base.java
+++ b/app/src/processing/app/Base.java
@@ -120,8 +120,16 @@ public class Base {
   private final List<JMenuItem> recentSketchesMenuItems = new LinkedList<>();
 
   static public void main(String args[]) throws Exception {
-    System.setProperty("awt.useSystemAAFontSettings", "on");
-    System.setProperty("swing.aatext", "true");
+    if (!OSUtils.isWindows()) {
+      // Those properties helps enabling anti-aliasing on Linux
+      // (but not on Windows where they made things worse actually
+      // and the font rendering becomes ugly).
+
+      // Those properties must be set before initializing any
+      // graphic object, otherwise they don't have any effect.
+      System.setProperty("awt.useSystemAAFontSettings", "on");
+      System.setProperty("swing.aatext", "true");
+    }
     System.setProperty("java.net.useSystemProxies", "true");
 
     if (OSUtils.isMacOS()) {
diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
index e6c82709e57..a4e2901140b 100644
--- a/build/shared/revisions.txt
+++ b/build/shared/revisions.txt
@@ -1,5 +1,7 @@
 ARDUINO 1.8.1
 
+[ide]
+* Fixed font rendering not anti-aliased on Windows (regression)
 
 ARDUINO 1.8.0 - 2016.12.20