diff --git a/platform/lang-impl/src/com/intellij/ui/ExperimentalUIImpl.kt b/platform/lang-impl/src/com/intellij/ui/ExperimentalUIImpl.kt
index d9f9114b9cf4..5f3826648ee6 100644
--- a/platform/lang-impl/src/com/intellij/ui/ExperimentalUIImpl.kt
+++ b/platform/lang-impl/src/com/intellij/ui/ExperimentalUIImpl.kt
@@ -7,7 +7,7 @@ import com.intellij.feedback.new_ui.state.NewUIInfoService
 import com.intellij.icons.AllIcons
 import com.intellij.ide.AppLifecycleListener
 import com.intellij.ide.IdeBundle
-import com.intellij.ide.actions.DistractionFreeModeController
+import com.intellij.ide.actions.ToggleDistractionFreeModeAction
 import com.intellij.ide.ui.IconMapLoader
 import com.intellij.ide.ui.LafManager
 import com.intellij.ide.ui.UISettings
@@ -98,7 +98,8 @@ private class ExperimentalUIImpl : ExperimentalUI() {
 
     if (isEnabled) {
       NewUIInfoService.getInstance().updateEnableNewUIDate()
-      if (!DistractionFreeModeController.isDistractionFreeModeEnabled()) {
+      // Do not force enabling tool window stripes in DFM
+      if (!ToggleDistractionFreeModeAction.shouldMinimizeCustomHeader()) {
         UISettings.getInstance().hideToolStripes = false
       }
     }