diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt
index d52ab5fd0..66b891222 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt
@@ -77,7 +77,6 @@ import androidx.compose.ui.res.stringArrayResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.util.fastAny
 import androidx.compose.ui.util.fastForEach
 import androidx.compose.ui.util.lerp
 import androidx.lifecycle.viewModelScope
@@ -342,20 +341,15 @@ fun GalleryListScreen(lub: ListUrlBuilder, navigator: DestinationsNavigator) = c
                                     checkBoxText = R.string.save_progress,
                                 ) { input, checked ->
                                     var text = input.trim()
-                                    nameEmpty.takeIf {
-                                        text.isEmpty()
-                                    } ?: dupName.takeIf {
-                                        if (checked) text += "@$next"
-                                        quickSearchList.fastAny { it.name == text }
-                                    } ?: run {
-                                        val quickSearch = urlBuilder.toQuickSearch(text)
-                                        quickSearch.position = quickSearchList.size
-                                        // Insert to DB first to update the id
-                                        EhDB.insertQuickSearch(quickSearch)
-                                        quickSearchList.add(quickSearch)
-                                        saveProgress = checked
-                                        null
-                                    }
+                                    ensure(text.isNotBlank()) { nameEmpty }
+                                    if (checked) text += "@$next"
+                                    ensure(quickSearchList.none { it.name == text }) { dupName }
+                                    val quickSearch = urlBuilder.toQuickSearch(text)
+                                    quickSearch.position = quickSearchList.size
+                                    // Insert to DB first to update the id
+                                    EhDB.insertQuickSearch(quickSearch)
+                                    quickSearchList.add(quickSearch)
+                                    saveProgress = checked
                                 }
                             }
                         }
diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/Dialog.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/Dialog.kt
index 6a1723283..e82f0dfbd 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/Dialog.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/Dialog.kt
@@ -208,7 +208,7 @@ class DialogState {
         checked: Boolean,
         @StringRes checkBoxText: Int,
         isNumber: Boolean = false,
-        invalidator: (suspend (String, Boolean) -> String?)? = null,
+        invalidator: (suspend Raise<String>.(String, Boolean) -> Unit)? = null,
     ): Pair<String, Boolean> {
         return dialog { cont ->
             val coroutineScope = rememberCoroutineScope()
@@ -223,7 +223,7 @@ class DialogState {
                             cont.resume(state to checkedState)
                         } else {
                             coroutineScope.launch {
-                                error = invalidator.invoke(state, checkedState)
+                                error = either { invalidator(state, checkedState) }.leftOrNull()
                                 error ?: cont.resume(state to checkedState)
                             }
                         }