diff --git a/platform/platform-impl/src/com/intellij/ui/AbstractExpandableItemsHandler.java b/platform/platform-impl/src/com/intellij/ui/AbstractExpandableItemsHandler.java
index 18e14e786a73..6b74352f4376 100644
--- a/platform/platform-impl/src/com/intellij/ui/AbstractExpandableItemsHandler.java
+++ b/platform/platform-impl/src/com/intellij/ui/AbstractExpandableItemsHandler.java
@@ -16,6 +16,7 @@ import com.intellij.util.ObjectUtils;
 import com.intellij.util.SingleEdtTaskScheduler;
 import com.intellij.util.ui.MouseEventAdapter;
 import com.intellij.util.ui.MouseEventHandler;
+import com.intellij.util.ui.StartupUiUtil;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.util.ui.accessibility.ScreenReader;
 import org.jetbrains.annotations.ApiStatus;
@@ -120,6 +121,7 @@ public abstract class AbstractExpandableItemsHandler<KeyType, ComponentType exte
       myComponent.validate();
     }
     myPopup = new MovablePopup(myComponent, myTipComponent);
+    myPopup.setHeavyWeight(!StartupUiUtil.isWaylandToolkit());
 
     MouseEventHandler dispatcher = new MouseEventHandler() {
       @Override