diff --git a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ModuleRvItem.kt b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ModuleRvItem.kt
index 59415e1d5..c1c3460fc 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ModuleRvItem.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ModuleRvItem.kt
@@ -84,10 +84,6 @@ class ModuleItem(val item: Module) : ObservableItem<ModuleItem>() {
     val isUpdated get() = item.updated
     val isModified get() = isRemoved || isUpdated
 
-    fun toggle() {
-        isEnabled = !isEnabled
-    }
-
     fun delete(viewModel: ModuleViewModel) {
         isRemoved = !isRemoved
         viewModel.updateActiveState()
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
index f7ec4626a..f60aeb3d9 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
@@ -179,9 +179,11 @@ class ModuleViewModel(
 
     override fun refresh(): Job {
         return viewModelScope.launch {
+            state = State.LOADING
             loadInstalled()
             if (itemsRemote.isEmpty())
                 loadRemote()
+            state = State.LOADED
         }
     }
 
diff --git a/app/src/main/res/layout/item_module_md2.xml b/app/src/main/res/layout/item_module_md2.xml
index 08f209d55..55b725fe3 100644
--- a/app/src/main/res/layout/item_module_md2.xml
+++ b/app/src/main/res/layout/item_module_md2.xml
@@ -29,7 +29,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:alpha="@{item.enabled ? 1f : .5f}"
-            android:onClick="@{() -> item.toggle()}"
             tools:layout_gravity="center"
             tools:layout_margin="@dimen/l1">