diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a29adbe1f..93176ac48 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -74,6 +74,10 @@ jobs:
       - name: Test (gradle)
         run: ./gradlew test --no-daemon
 
+      - name: Stop Gradle Daemon
+        if: always()
+        run: ./gradlew --stop
+
       - name: Android Test Report
         uses: asadmansr/android-test-report-action@v1.2.0
         if: ${{ always() && matrix.os == 'ubuntu-latest' }}
@@ -191,6 +195,10 @@ jobs:
       - name: Build Desktop Distribution
         run: ./gradlew :desktopApp:${{ matrix.task }}
 
+      - name: Stop Gradle Daemon
+        if: always()
+        run: ./gradlew --stop
+
       - name: Upload Desktop Distribution
         uses: actions/upload-artifact@v6
         with:
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/layouts/DisappearingTopBar.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/layouts/DisappearingTopBar.kt
index 931570bd8..a70737255 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/layouts/DisappearingTopBar.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/layouts/DisappearingTopBar.kt
@@ -38,6 +38,7 @@ import androidx.compose.material3.TopAppBarState
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.Stable
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
@@ -217,6 +218,7 @@ fun enterAlwaysScrollBehavior(
  * Custom copy of EnterAlwaysScrollBehavior that correctly handles reversed layouts
  */
 @OptIn(ExperimentalMaterial3Api::class)
+@Stable
 class CustomEnterAlwaysScrollBehavior(
     override val state: TopAppBarState,
     override val snapAnimationSpec: AnimationSpec<Float>?,