backport 6fe9143bbbe269af62d2084834fc0c9afc51b5f3

Author: GoeLin

src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java

@@ -1118,6 +1118,9 @@ public Component getListCellRendererComponent(JList<?> list, Object value, int i
             if (showFileIcons) {
                 setIcon(getFileChooser().getIcon((File)value));
             }
+
+            putClientProperty("html.disable", getFileChooser().getClientProperty("html.disable"));
+
             return this;
         }
     }
@@ -1135,6 +1138,9 @@ public Component getListCellRendererComponent(JList<?> list, Object value, int i
             } else {
                 setText(getFileChooser().getName((File)value) + "/");
             }
+
+            putClientProperty("html.disable", getFileChooser().getClientProperty("html.disable"));
+
             return this;
         }
     }

test/jdk/javax/swing/JFileChooser/HTMLFileName.java

@@ -41,7 +41,7 @@
 
 /*
  * @test id=system
- * @bug 8139228
+ * @bug 8139228 8358532
  * @summary JFileChooser should not render Directory names in HTML format
  * @library /java/awt/regtesthelpers
  * @build PassFailJFrame