diff --git a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt
index 544531c9..a5d4b56b 100644
--- a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt
+++ b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt
@@ -49,7 +49,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalClipboardManager
-import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.platform.LocalTextInputService
 import androidx.compose.ui.platform.LocalTextToolbar
 import androidx.compose.ui.platform.LocalView
@@ -119,13 +118,6 @@ private fun HistoryListContent(
     formatterSymbols: FormatterSymbols,
 ) {
     val state = rememberLazyListState()
-    val focusManager = LocalFocusManager.current
-
-    // Very bad workaround for https://issuetracker.google.com/issues/295745063
-    // Will remove once the fix is released
-    LaunchedEffect(state.isScrollInProgress) {
-        focusManager.clearFocus(true)
-    }
 
     LaunchedEffect(historyItems) { state.scrollToItem(0) }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d9f25506..f41f740c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,15 +4,15 @@ appName = "Olive Green"
 
 androidGradlePlugin = "8.1.2"
 androidxAppCompatAppCompat = "1.6.1"
-androidxCompose = "1.6.0-alpha07"
+androidxCompose = "1.6.0-alpha08"
 androidxComposeCompiler = "1.5.0"
-androidxComposeMaterial3 = "1.2.0-alpha09"
+androidxComposeMaterial3 = "1.2.0-alpha10"
 androidxCoreCoreKts = "1.12.0"
 androidxDatastoreDatastorePreferences = "1.0.0"
 androidxHiltHiltNavigationCompose = "1.0.0"
 androidxLifecycleLifecycleRuntimeCompose = "2.6.2"
 androidxNavigationNavigationCompose = "2.7.4"
-androidxRoom = "2.6.0-rc01"
+androidxRoom = "2.6.0"
 androidxTest = "1.5.0"
 androidxTestExtJunitKtx = "1.1.5"
 androidxTestRunner = "1.5.2"