diff --git a/app/src/main/java/org/koitharu/kotatsu/shelf/ui/ShelfMenuProvider.kt b/app/src/main/java/org/koitharu/kotatsu/shelf/ui/ShelfMenuProvider.kt
index b4d8fb5a2..8b6f5dfeb 100644
--- a/app/src/main/java/org/koitharu/kotatsu/shelf/ui/ShelfMenuProvider.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/shelf/ui/ShelfMenuProvider.kt
@@ -6,16 +6,16 @@ import android.view.MenuInflater
 import android.view.MenuItem
 import androidx.core.view.MenuProvider
 import androidx.fragment.app.FragmentManager
-import com.google.android.material.R as materialR
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import java.util.*
-import java.util.concurrent.TimeUnit
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.dialog.RememberSelectionDialogListener
-import org.koitharu.kotatsu.shelf.ui.config.categories.ShelfConfigSheet
-import org.koitharu.kotatsu.shelf.ui.config.size.ShelfSizeBottomSheet
 import org.koitharu.kotatsu.local.ui.ImportDialogFragment
+import org.koitharu.kotatsu.shelf.ui.config.ShelfConfigSheet
+import org.koitharu.kotatsu.shelf.ui.config.size.ShelfSizeBottomSheet
 import org.koitharu.kotatsu.utils.ext.startOfDay
+import java.util.Date
+import java.util.concurrent.TimeUnit
+import com.google.android.material.R as materialR
 
 class ShelfMenuProvider(
 	private val context: Context,
diff --git a/app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/categories/ShelfConfigAD.kt b/app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/ShelfConfigAD.kt
similarity index 97%
rename from app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/categories/ShelfConfigAD.kt
rename to app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/ShelfConfigAD.kt
index a83180efb..fae0f67f0 100644
--- a/app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/categories/ShelfConfigAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/ShelfConfigAD.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.shelf.ui.config.categories
+package org.koitharu.kotatsu.shelf.ui.config
 
 import androidx.core.view.updatePaddingRelative
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
diff --git a/app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/categories/ShelfConfigAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/ShelfConfigAdapter.kt
similarity index 95%
rename from app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/categories/ShelfConfigAdapter.kt
rename to app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/ShelfConfigAdapter.kt
index 166dcf680..7b8417830 100644
--- a/app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/categories/ShelfConfigAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/ShelfConfigAdapter.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.shelf.ui.config.categories
+package org.koitharu.kotatsu.shelf.ui.config
 
 import androidx.recyclerview.widget.DiffUtil
 import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
diff --git a/app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/categories/ShelfConfigModel.kt b/app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/ShelfConfigModel.kt
similarity index 95%
rename from app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/categories/ShelfConfigModel.kt
rename to app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/ShelfConfigModel.kt
index f385b84be..996840a06 100644
--- a/app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/categories/ShelfConfigModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/ShelfConfigModel.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.shelf.ui.config.categories
+package org.koitharu.kotatsu.shelf.ui.config
 
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.shelf.domain.ShelfSection
diff --git a/app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/categories/ShelfConfigSheet.kt b/app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/ShelfConfigSheet.kt
similarity index 96%
rename from app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/categories/ShelfConfigSheet.kt
rename to app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/ShelfConfigSheet.kt
index 0f2b7ab88..24fa59482 100644
--- a/app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/categories/ShelfConfigSheet.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/ShelfConfigSheet.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.shelf.ui.config.categories
+package org.koitharu.kotatsu.shelf.ui.config
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/categories/ShelfConfigViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/ShelfConfigViewModel.kt
similarity index 87%
rename from app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/categories/ShelfConfigViewModel.kt
rename to app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/ShelfConfigViewModel.kt
index 5e9cb38da..bd80a7976 100644
--- a/app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/categories/ShelfConfigViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/ShelfConfigViewModel.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.shelf.ui.config.categories
+package org.koitharu.kotatsu.shelf.ui.config
 
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -39,10 +39,15 @@ class ShelfConfigViewModel @Inject constructor(
 				}
 
 				is ShelfConfigModel.Section -> {
-					if (item.isChecked) {
-						settings.shelfSections -= item.section
+					val sections = settings.shelfSections
+					settings.shelfSections = if (item.isChecked) {
+						if (sections.size > 1) {
+							sections - item.section
+						} else {
+							return@launchJob
+						}
 					} else {
-						settings.shelfSections += item.section
+						sections + item.section
 					}
 				}
 			}