diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
index eb68ee22a..6fe01794a 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
@@ -125,14 +125,18 @@ class HomeViewModel(
 
     fun onDeletePressed() = UninstallDialog().publish()
 
-    fun onManagerPressed() =
-        if (isConnected.get()) ManagerInstallDialog().publish()
-        else SnackbarEvent(R.string.no_connection).publish()
+    fun onManagerPressed() = when (state) {
+        State.LOADED -> ManagerInstallDialog().publish()
+        State.LOADING -> SnackbarEvent(R.string.loading).publish()
+        else -> SnackbarEvent(R.string.no_connection).publish()
+    }
 
-    fun onMagiskPressed() = if (isConnected.get()) withExternalRW {
-        HomeFragmentDirections.actionHomeFragmentToInstallFragment().publish()
-    } else {
-        SnackbarEvent(R.string.no_connection).publish()
+    fun onMagiskPressed() = when (state) {
+        State.LOADED -> withExternalRW {
+            HomeFragmentDirections.actionHomeFragmentToInstallFragment().publish()
+        }
+        State.LOADING -> SnackbarEvent(R.string.loading).publish()
+        else -> SnackbarEvent(R.string.no_connection).publish()
     }
 
     fun onSafetyNetPressed() =