diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/preview/IntentionPreviewPopupUpdateProcessor.kt b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/preview/IntentionPreviewPopupUpdateProcessor.kt
index decff18fdaa7..cb08cbe2be20 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/preview/IntentionPreviewPopupUpdateProcessor.kt
+++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/preview/IntentionPreviewPopupUpdateProcessor.kt
@@ -34,6 +34,8 @@ import com.intellij.ui.popup.PopupPositionManager.Position.RIGHT
 import com.intellij.ui.popup.PopupPositionManager.PositionAdjuster
 import com.intellij.ui.popup.PopupUpdateProcessor
 import com.intellij.ui.popup.util.PopupImplUtil
+import com.intellij.ui.util.height
+import com.intellij.ui.util.width
 import com.intellij.util.cancelOnDispose
 import com.intellij.util.ui.UIUtil
 import kotlinx.coroutines.*
@@ -97,10 +99,9 @@ class IntentionPreviewPopupUpdateProcessor internal constructor(
 
       component.addComponentListener(object : ComponentAdapter() {
         override fun componentResized(e: ComponentEvent?) {
-          var size = popup.size
-          size = Dimension(size.width.coerceAtLeast(MIN_WIDTH), size.height)
-          popup.content.preferredSize = size
-          popup.size = size
+          val size = popup.size
+          val insets = popup.content.insets
+          popup.size = Dimension((size.width - insets.width).coerceAtLeast(MIN_WIDTH), size.height - insets.height)
           adjustPosition(originalPopup, true)
         }
       })
diff --git a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
index d210f6bb8ef6..18bb438c383c 100644
--- a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
+++ b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
@@ -2185,9 +2185,7 @@ public class AbstractPopup implements JBPopup, ScreenAreaConsumer, AlignedPopup
         size = window.getSize(); // use current window size
       }
       else {
-        if (!Registry.is("ide.popup.fix.ijpl172384", false)) {
-          JBInsets.addTo(size, insets);
-        }
+        JBInsets.addTo(size, insets);
         if (LOG.isDebugEnabled()) {
           LOG.debug("Update content preferred size: width = " + size.width + " height = " + size.height);
         }
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index 2578cc5e9980..3974745f1e90 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -62,8 +62,6 @@ ide.forcedShowTooltip.description=Shortcut for forced show tooltip.
 
 ide.popup.auto.delay=500
 ide.popup.auto.delay.description=The delay in milliseconds before a sub-popup is automatically shown.
-ide.popup.fix.ijpl172384=false
-ide.popup.fix.ijpl172384.description=Fix of IJPL-172384. The key will be removed after the verification
 ide.instant.shutdown=true
 ide.instant.shutdown.description=Hides all windows immediately after a user invoked Exit action
 ide.popup.navigation.via.actions=true