diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml
index 031907a9eba2..edb9b5dabfef 100644
--- a/.idea/inspectionProfiles/idea_default.xml
+++ b/.idea/inspectionProfiles/idea_default.xml
@@ -841,6 +841,11 @@
         <constraint name="s1" minCount="0" maxCount="2147483647" within="" contains="" />
         <constraint name="s2" minCount="0" maxCount="2147483647" within="" contains="" />
       </replaceConfiguration>
+      <replaceConfiguration name="Too convoluted &quot;register(()-&gt;dispose())&quot; (wastes memory)" text="Disposer.register($myRoot$, () -&gt; Disposer.dispose($myFolder2$));" recursive="true" caseInsensitive="true" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" replacement="Disposer.register($myRoot$, $myFolder2$);">
+        <constraint name="__context__" within="" contains="" />
+        <constraint name="myRoot" within="" contains="" />
+        <constraint name="myFolder2" within="" contains="" />
+      </replaceConfiguration>
     </inspection_tool>
     <inspection_tool class="SafeVarargsDetector" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="SeamAnnotationIncorrectSignatureInspection" enabled="false" level="ERROR" enabled_by_default="false" />
diff --git a/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java b/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java
index ec0ac231b5ac..551595cb679a 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java
@@ -179,7 +179,7 @@ public class FileStructurePopup implements Disposable, TreeActionsOwner {
     myAsyncTreeModel.setRootImmediately(myStructureTreeModel.getRootImmediately());
     myTree = new MyTree(myAsyncTreeModel);
     StructureViewComponent.registerAutoExpandListener(myTree, myTreeModel);
-    Disposer.register(this, () -> Disposer.dispose(myTreeModelWrapper));
+    Disposer.register(this, myTreeModelWrapper);
 
     ModelListener modelListener = () -> rebuild(false);
     myTreeModel.addModelListener(modelListener);
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogProgress.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogProgress.java
index eef3f18458ca..a469014d5cf6 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogProgress.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogProgress.java
@@ -24,7 +24,7 @@ public class VcsLogProgress implements Disposable {
   private boolean myDisposed = false;
 
   public VcsLogProgress(@NotNull Project project, @NotNull Disposable parent) {
-    Disposer.register(parent, () -> Disposer.dispose(this));
+    Disposer.register(parent, this);
     Disposer.register(project, this);
   }
 
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/util/VcsLogUtil.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/util/VcsLogUtil.java
index 87cd20aa6f5a..ea0a69ea878f 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/util/VcsLogUtil.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/util/VcsLogUtil.java
@@ -227,7 +227,7 @@ public class VcsLogUtil {
    * @param disposable disposable to register.
    */
   public static void registerWithParentAndProject(@NotNull Disposable parent, @NotNull Project project, @NotNull Disposable disposable) {
-    Disposer.register(parent, () -> Disposer.dispose(disposable));
+    Disposer.register(parent, disposable);
     Disposer.register(project, disposable);
   }