diff --git a/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java b/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java
index 2a4d73799b02..824178d548fb 100644
--- a/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java
+++ b/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java
@@ -140,8 +140,7 @@ public class IdeaApplication {
           setWM(xwm, "METACITY_WM");  // Mutter support absent - mimic Metacity
         }
       }
-      else if ("Muffin".equals(wmName)) {
-        // Muffin is completely unsupported at the moment - so mimic Mutter if possible, Metacity otherwise
+      else if ("Muffin".equals(wmName) || "GNOME Shell".equals(wmName)) {
         try {
           xwmClass.getDeclaredField("MUTTER_WM");
           setWM(xwm, "MUTTER_WM");
@@ -151,7 +150,6 @@ public class IdeaApplication {
         }
       }
       else if ("Marco".equals(wmName)) {
-        // Marco is another useless Metacity clone
         setWM(xwm, "METACITY_WM");
       }
       else if ("awesome".equals(wmName)) {