diff --git a/composeApp/src/commonMain/kotlin/ru/csasq/cit_is_bot/ui/dialogs/ScenarioDialog.kt b/composeApp/src/commonMain/kotlin/ru/csasq/cit_is_bot/ui/dialogs/ScenarioDialog.kt
index 750ae79..e31f007 100644
--- a/composeApp/src/commonMain/kotlin/ru/csasq/cit_is_bot/ui/dialogs/ScenarioDialog.kt
+++ b/composeApp/src/commonMain/kotlin/ru/csasq/cit_is_bot/ui/dialogs/ScenarioDialog.kt
@@ -27,9 +27,12 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.snapshotFlow
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.pointer.PointerIcon
 import androidx.compose.ui.input.pointer.pointerHoverIcon
@@ -80,6 +83,19 @@ fun ScenarioDialog(
         },
         properties = properties,
     ) {
+        val verticalScrollState = rememberScrollState()
+        val floatingActionButtonExpandedState = remember {
+            mutableStateOf(true)
+        }
+        LaunchedEffect(verticalScrollState) {
+            var previousValue = 0
+            snapshotFlow {
+                verticalScrollState.value
+            }.collect {
+                floatingActionButtonExpandedState.value = it <= previousValue
+                previousValue = it
+            }
+        }
         Scaffold(
             modifier = Modifier
                 .fillMaxSize(),
@@ -185,7 +201,7 @@ fun ScenarioDialog(
                             contentDescription = null,
                         )
                     },
-                    expanded = true,
+                    expanded = floatingActionButtonExpandedState.value,
                 )
             },
         ) { paddingValues ->
@@ -193,7 +209,7 @@ fun ScenarioDialog(
                 modifier = Modifier
                     .fillMaxSize()
                     .verticalScroll(
-                        state = rememberScrollState(),
+                        state = verticalScrollState,
                     )
                     .padding(paddingValues)
                     .padding(
@@ -467,7 +483,6 @@ fun ScenarioDialog(
                                     },
                                     isError = false,
                                     singleLine = true,
-                                    maxLines = 3,
                                 )
                                 Spacer(
                                     modifier = Modifier
@@ -484,7 +499,9 @@ fun ScenarioDialog(
                                 val optionState = remember {
                                     mutableStateOf("")
                                 }
-                                Row {
+                                Row(
+                                    verticalAlignment = Alignment.CenterVertically,
+                                ) {
                                     OutlinedTextField(
                                         value = optionState.value,
                                         onValueChange = { value ->
@@ -498,7 +515,6 @@ fun ScenarioDialog(
                                         label = {},
                                         isError = false,
                                         singleLine = true,
-                                        maxLines = 3,
                                     )
                                     Spacer(
                                         modifier = Modifier
diff --git a/composeApp/src/commonMain/kotlin/ru/csasq/cit_is_bot/ui/screens/ScenariosScreen.kt b/composeApp/src/commonMain/kotlin/ru/csasq/cit_is_bot/ui/screens/ScenariosScreen.kt
index f30f396..2b651cf 100644
--- a/composeApp/src/commonMain/kotlin/ru/csasq/cit_is_bot/ui/screens/ScenariosScreen.kt
+++ b/composeApp/src/commonMain/kotlin/ru/csasq/cit_is_bot/ui/screens/ScenariosScreen.kt
@@ -1,6 +1,5 @@
 package ru.csasq.cit_is_bot.ui.screens
 
-import androidx.compose.foundation.ScrollState
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
@@ -11,14 +10,12 @@ import androidx.compose.material3.ExtendedFloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
-import androidx.compose.ui.input.nestedscroll.NestedScrollSource
-import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.navigation.NavController
 import cit_is_bot.composeapp.generated.resources.Res
@@ -47,6 +44,19 @@ fun ScenariosScreen(
     paddingValues: PaddingValues,
     floatingActionButtonState: MutableState<(@Composable () -> Unit)?>,
 ) {
+    val verticalScrollState = rememberScrollState()
+    val floatingActionButtonExpandedState = remember {
+        mutableStateOf(true)
+    }
+    LaunchedEffect(verticalScrollState) {
+        var previousValue = 0
+        snapshotFlow {
+            verticalScrollState.value
+        }.collect {
+            floatingActionButtonExpandedState.value = it <= previousValue
+            previousValue = it
+        }
+    }
     Column(
         modifier = Modifier
             .padding(
@@ -54,15 +64,12 @@ fun ScenariosScreen(
             )
             .fillMaxSize()
             .verticalScroll(
-                state = rememberScrollState(),
+                state = verticalScrollState,
             ),
     ) {
         val scenarioDialogState = remember {
             mutableStateOf<Scenario?>(null)
         }
-        val floatingActionButtonExpandedState = remember {
-            mutableStateOf(true)
-        }
         floatingActionButtonState.value = @Composable {
             ExtendedFloatingActionButton(
                 text = {