diff --git a/arduino-core/src/processing/app/linux/Platform.java b/arduino-core/src/processing/app/linux/Platform.java
index 8c507234795..2220aaeb67d 100644
--- a/arduino-core/src/processing/app/linux/Platform.java
+++ b/arduino-core/src/processing/app/linux/Platform.java
@@ -37,10 +37,11 @@
  */
 public class Platform extends processing.app.Platform {
 
-  // TODO Need to be smarter here since KDE people ain't gonna like that GTK.
-  //      It may even throw a weird exception at 'em for their trouble.
   @Override
   public void setLookAndFeel() throws Exception {
+    // Override desktop check
+    System.setProperty("sun.desktop", "gnome");
+    super.setLookAndFeel();
     GTKLookAndFeelFixer.installGtkPopupBugWorkaround();
   }
 
diff --git a/build/linux/dist/arduino b/build/linux/dist/arduino
index ad97c916022..f70c65082bf 100755
--- a/build/linux/dist/arduino
+++ b/build/linux/dist/arduino
@@ -25,7 +25,7 @@ if [ -x "$APPDIR/java/bin/java" ]; then
 fi
 
 # Collect options to java in an array, to properly handle whitespace in options
-JAVA_OPTIONS=("-DAPP_DIR=$APPDIR" "-Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel")
+JAVA_OPTIONS=("-DAPP_DIR=$APPDIR")
 
 # Only show the splash screen when no options are present
 if [[ "$@" != *"--"* ]] ; then