diff --git a/platform/jewel/ui/api-dump.txt b/platform/jewel/ui/api-dump.txt
index e7d09117cd855..1015ce1b16bbd 100644
--- a/platform/jewel/ui/api-dump.txt
+++ b/platform/jewel/ui/api-dump.txt
@@ -632,12 +632,12 @@ f:org.jetbrains.jewel.ui.component.ScrollableContainerKt
 - sf:HorizontallyScrollableContainer(androidx.compose.foundation.gestures.ScrollableState,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,Z,Z,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function3,androidx.compose.runtime.Composer,I,I):V
 - bsf:HorizontallyScrollableContainer(androidx.compose.foundation.lazy.LazyListState,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,Z,Z,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function3,androidx.compose.runtime.Composer,I,I):V
 - bsf:HorizontallyScrollableContainer(androidx.compose.foundation.lazy.grid.LazyGridState,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,Z,Z,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function3,androidx.compose.runtime.Composer,I,I):V
-- sf:HorizontallyScrollableContainer(androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,androidx.compose.foundation.ScrollState,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,Z,Z,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function3,androidx.compose.runtime.Composer,I,I):V
+- bsf:HorizontallyScrollableContainer(androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,androidx.compose.foundation.ScrollState,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,Z,Z,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function3,androidx.compose.runtime.Composer,I,I):V
 - sf:HorizontallyScrollableContainer(androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,androidx.compose.foundation.ScrollState,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,Z,Z,Z,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function3,androidx.compose.runtime.Composer,I,I):V
 - sf:VerticallyScrollableContainer(androidx.compose.foundation.gestures.ScrollableState,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,Z,Z,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function3,androidx.compose.runtime.Composer,I,I):V
 - bsf:VerticallyScrollableContainer(androidx.compose.foundation.lazy.LazyListState,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,Z,Z,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function3,androidx.compose.runtime.Composer,I,I):V
 - bsf:VerticallyScrollableContainer(androidx.compose.foundation.lazy.grid.LazyGridState,androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,Z,Z,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function3,androidx.compose.runtime.Composer,I,I):V
-- sf:VerticallyScrollableContainer(androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,androidx.compose.foundation.ScrollState,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,Z,Z,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function3,androidx.compose.runtime.Composer,I,I):V
+- bsf:VerticallyScrollableContainer(androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,androidx.compose.foundation.ScrollState,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,Z,Z,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function3,androidx.compose.runtime.Composer,I,I):V
 - sf:VerticallyScrollableContainer(androidx.compose.ui.Modifier,androidx.compose.ui.Modifier,androidx.compose.foundation.ScrollState,org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,Z,Z,Z,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function3,androidx.compose.runtime.Composer,I,I):V
 - sf:scrollbarContentSafePadding(org.jetbrains.jewel.ui.component.styling.ScrollbarStyle,androidx.compose.runtime.Composer,I,I):F
 f:org.jetbrains.jewel.ui.component.ScrollbarKt
diff --git a/platform/jewel/ui/metalava/ui-api-0.36.0.txt b/platform/jewel/ui/metalava/ui-api-0.36.0.txt
index 85a480a974fa6..1bade61936fee 100644
--- a/platform/jewel/ui/metalava/ui-api-0.36.0.txt
+++ b/platform/jewel/ui/metalava/ui-api-0.36.0.txt
@@ -683,12 +683,12 @@ package org.jetbrains.jewel.ui.component {
     method @androidx.compose.runtime.Composable public static void HorizontallyScrollableContainer(androidx.compose.foundation.gestures.ScrollableState scrollState, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier scrollbarModifier, optional org.jetbrains.jewel.ui.component.styling.ScrollbarStyle style, optional boolean reverseLayout, optional boolean scrollbarEnabled, optional androidx.compose.foundation.interaction.MutableInteractionSource scrollbarInteractionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
     method @Deprecated @androidx.compose.runtime.Composable public static void HorizontallyScrollableContainer(androidx.compose.foundation.lazy.grid.LazyGridState scrollState, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier scrollbarModifier, optional org.jetbrains.jewel.ui.component.styling.ScrollbarStyle style, optional boolean reverseLayout, optional boolean scrollbarEnabled, optional androidx.compose.foundation.interaction.MutableInteractionSource scrollbarInteractionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
     method @Deprecated @androidx.compose.runtime.Composable public static void HorizontallyScrollableContainer(androidx.compose.foundation.lazy.LazyListState scrollState, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier scrollbarModifier, optional org.jetbrains.jewel.ui.component.styling.ScrollbarStyle style, optional boolean reverseLayout, optional boolean scrollbarEnabled, optional androidx.compose.foundation.interaction.MutableInteractionSource scrollbarInteractionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
-    method @androidx.compose.runtime.Composable public static void HorizontallyScrollableContainer(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier scrollbarModifier, optional androidx.compose.foundation.ScrollState scrollState, optional org.jetbrains.jewel.ui.component.styling.ScrollbarStyle style, optional boolean reverseLayout, optional boolean scrollbarEnabled, optional androidx.compose.foundation.interaction.MutableInteractionSource scrollbarInteractionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+    method @Deprecated @androidx.compose.runtime.Composable public static void HorizontallyScrollableContainer(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier scrollbarModifier, optional androidx.compose.foundation.ScrollState scrollState, optional org.jetbrains.jewel.ui.component.styling.ScrollbarStyle style, optional boolean reverseLayout, optional boolean scrollbarEnabled, optional androidx.compose.foundation.interaction.MutableInteractionSource scrollbarInteractionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
     method @androidx.compose.runtime.Composable public static void HorizontallyScrollableContainer(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier scrollbarModifier, optional androidx.compose.foundation.ScrollState scrollState, optional org.jetbrains.jewel.ui.component.styling.ScrollbarStyle style, optional boolean reverseLayout, optional boolean userScrollEnabled, optional boolean scrollbarEnabled, optional androidx.compose.foundation.interaction.MutableInteractionSource scrollbarInteractionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
     method @androidx.compose.runtime.Composable public static void VerticallyScrollableContainer(androidx.compose.foundation.gestures.ScrollableState scrollState, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier scrollbarModifier, optional org.jetbrains.jewel.ui.component.styling.ScrollbarStyle style, optional boolean reverseLayout, optional boolean scrollbarEnabled, optional androidx.compose.foundation.interaction.MutableInteractionSource scrollbarInteractionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
     method @Deprecated @androidx.compose.runtime.Composable public static void VerticallyScrollableContainer(androidx.compose.foundation.lazy.grid.LazyGridState scrollState, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier scrollbarModifier, optional org.jetbrains.jewel.ui.component.styling.ScrollbarStyle style, optional boolean reverseLayout, optional boolean scrollbarEnabled, optional androidx.compose.foundation.interaction.MutableInteractionSource scrollbarInteractionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
     method @Deprecated @androidx.compose.runtime.Composable public static void VerticallyScrollableContainer(androidx.compose.foundation.lazy.LazyListState scrollState, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier scrollbarModifier, optional org.jetbrains.jewel.ui.component.styling.ScrollbarStyle style, optional boolean reverseLayout, optional boolean scrollbarEnabled, optional androidx.compose.foundation.interaction.MutableInteractionSource scrollbarInteractionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
-    method @androidx.compose.runtime.Composable public static void VerticallyScrollableContainer(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier scrollbarModifier, optional androidx.compose.foundation.ScrollState scrollState, optional org.jetbrains.jewel.ui.component.styling.ScrollbarStyle style, optional boolean reverseLayout, optional boolean scrollbarEnabled, optional androidx.compose.foundation.interaction.MutableInteractionSource scrollbarInteractionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+    method @Deprecated @androidx.compose.runtime.Composable public static void VerticallyScrollableContainer(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier scrollbarModifier, optional androidx.compose.foundation.ScrollState scrollState, optional org.jetbrains.jewel.ui.component.styling.ScrollbarStyle style, optional boolean reverseLayout, optional boolean scrollbarEnabled, optional androidx.compose.foundation.interaction.MutableInteractionSource scrollbarInteractionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
     method @androidx.compose.runtime.Composable public static void VerticallyScrollableContainer(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier scrollbarModifier, optional androidx.compose.foundation.ScrollState scrollState, optional org.jetbrains.jewel.ui.component.styling.ScrollbarStyle style, optional boolean reverseLayout, optional boolean userScrollEnabled, optional boolean scrollbarEnabled, optional androidx.compose.foundation.interaction.MutableInteractionSource scrollbarInteractionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
     method @androidx.compose.runtime.Composable public static float scrollbarContentSafePadding(optional org.jetbrains.jewel.ui.component.styling.ScrollbarStyle style);
   }
diff --git a/platform/jewel/ui/metalava/ui-api-stable-0.36.0.txt b/platform/jewel/ui/metalava/ui-api-stable-0.36.0.txt
index 5026e755e224d..fff13bd65a348 100644
--- a/platform/jewel/ui/metalava/ui-api-stable-0.36.0.txt
+++ b/platform/jewel/ui/metalava/ui-api-stable-0.36.0.txt
@@ -641,12 +641,12 @@ package org.jetbrains.jewel.ui.component {
     method @androidx.compose.runtime.Composable public static void HorizontallyScrollableContainer(androidx.compose.foundation.gestures.ScrollableState scrollState, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier scrollbarModifier, optional org.jetbrains.jewel.ui.component.styling.ScrollbarStyle style, optional boolean reverseLayout, optional boolean scrollbarEnabled, optional androidx.compose.foundation.interaction.MutableInteractionSource scrollbarInteractionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
     method @Deprecated @androidx.compose.runtime.Composable public static void HorizontallyScrollableContainer(androidx.compose.foundation.lazy.grid.LazyGridState scrollState, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier scrollbarModifier, optional org.jetbrains.jewel.ui.component.styling.ScrollbarStyle style, optional boolean reverseLayout, optional boolean scrollbarEnabled, optional androidx.compose.foundation.interaction.MutableInteractionSource scrollbarInteractionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
     method @Deprecated @androidx.compose.runtime.Composable public static void HorizontallyScrollableContainer(androidx.compose.foundation.lazy.LazyListState scrollState, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier scrollbarModifier, optional org.jetbrains.jewel.ui.component.styling.ScrollbarStyle style, optional boolean reverseLayout, optional boolean scrollbarEnabled, optional androidx.compose.foundation.interaction.MutableInteractionSource scrollbarInteractionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
-    method @androidx.compose.runtime.Composable public static void HorizontallyScrollableContainer(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier scrollbarModifier, optional androidx.compose.foundation.ScrollState scrollState, optional org.jetbrains.jewel.ui.component.styling.ScrollbarStyle style, optional boolean reverseLayout, optional boolean scrollbarEnabled, optional androidx.compose.foundation.interaction.MutableInteractionSource scrollbarInteractionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+    method @Deprecated @androidx.compose.runtime.Composable public static void HorizontallyScrollableContainer(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier scrollbarModifier, optional androidx.compose.foundation.ScrollState scrollState, optional org.jetbrains.jewel.ui.component.styling.ScrollbarStyle style, optional boolean reverseLayout, optional boolean scrollbarEnabled, optional androidx.compose.foundation.interaction.MutableInteractionSource scrollbarInteractionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
     method @androidx.compose.runtime.Composable public static void HorizontallyScrollableContainer(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier scrollbarModifier, optional androidx.compose.foundation.ScrollState scrollState, optional org.jetbrains.jewel.ui.component.styling.ScrollbarStyle style, optional boolean reverseLayout, optional boolean userScrollEnabled, optional boolean scrollbarEnabled, optional androidx.compose.foundation.interaction.MutableInteractionSource scrollbarInteractionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
     method @androidx.compose.runtime.Composable public static void VerticallyScrollableContainer(androidx.compose.foundation.gestures.ScrollableState scrollState, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier scrollbarModifier, optional org.jetbrains.jewel.ui.component.styling.ScrollbarStyle style, optional boolean reverseLayout, optional boolean scrollbarEnabled, optional androidx.compose.foundation.interaction.MutableInteractionSource scrollbarInteractionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
     method @Deprecated @androidx.compose.runtime.Composable public static void VerticallyScrollableContainer(androidx.compose.foundation.lazy.grid.LazyGridState scrollState, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier scrollbarModifier, optional org.jetbrains.jewel.ui.component.styling.ScrollbarStyle style, optional boolean reverseLayout, optional boolean scrollbarEnabled, optional androidx.compose.foundation.interaction.MutableInteractionSource scrollbarInteractionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
     method @Deprecated @androidx.compose.runtime.Composable public static void VerticallyScrollableContainer(androidx.compose.foundation.lazy.LazyListState scrollState, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier scrollbarModifier, optional org.jetbrains.jewel.ui.component.styling.ScrollbarStyle style, optional boolean reverseLayout, optional boolean scrollbarEnabled, optional androidx.compose.foundation.interaction.MutableInteractionSource scrollbarInteractionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
-    method @androidx.compose.runtime.Composable public static void VerticallyScrollableContainer(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier scrollbarModifier, optional androidx.compose.foundation.ScrollState scrollState, optional org.jetbrains.jewel.ui.component.styling.ScrollbarStyle style, optional boolean reverseLayout, optional boolean scrollbarEnabled, optional androidx.compose.foundation.interaction.MutableInteractionSource scrollbarInteractionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+    method @Deprecated @androidx.compose.runtime.Composable public static void VerticallyScrollableContainer(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier scrollbarModifier, optional androidx.compose.foundation.ScrollState scrollState, optional org.jetbrains.jewel.ui.component.styling.ScrollbarStyle style, optional boolean reverseLayout, optional boolean scrollbarEnabled, optional androidx.compose.foundation.interaction.MutableInteractionSource scrollbarInteractionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
     method @androidx.compose.runtime.Composable public static void VerticallyScrollableContainer(optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Modifier scrollbarModifier, optional androidx.compose.foundation.ScrollState scrollState, optional org.jetbrains.jewel.ui.component.styling.ScrollbarStyle style, optional boolean reverseLayout, optional boolean userScrollEnabled, optional boolean scrollbarEnabled, optional androidx.compose.foundation.interaction.MutableInteractionSource scrollbarInteractionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
     method @androidx.compose.runtime.Composable public static float scrollbarContentSafePadding(optional org.jetbrains.jewel.ui.component.styling.ScrollbarStyle style);
   }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/ScrollableContainer.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/ScrollableContainer.kt
index 1fd81ab3474b4..72482bc1ff235 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/ScrollableContainer.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/ScrollableContainer.kt
@@ -96,6 +96,10 @@ internal enum class ScrollbarPosition {
  * @param content The main content of the scrollable container
  * @see com.intellij.ui.components.JBScrollBar
  */
+@Deprecated(
+    "Use the overload that takes a ScrollState with userScrollEnabled parameter",
+    level = DeprecationLevel.HIDDEN,
+)
 @Composable
 public fun VerticallyScrollableContainer(
     modifier: Modifier = Modifier,
@@ -450,6 +454,10 @@ public fun VerticallyScrollableContainer(
  * @param content The content to be displayed in the scrollable container
  * @see com.intellij.ui.components.JBScrollBar
  */
+@Deprecated(
+    "Use the overload that takes a ScrollState with userScrollEnabled parameter",
+    level = DeprecationLevel.HIDDEN,
+)
 @Composable
 public fun HorizontallyScrollableContainer(
     modifier: Modifier = Modifier,