diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/BaseActivity.kt b/app/src/main/java/com/aurora/store/view/ui/commons/BaseActivity.kt
index 05f847b43..40d62e088 100644
--- a/app/src/main/java/com/aurora/store/view/ui/commons/BaseActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/BaseActivity.kt
@@ -141,9 +141,7 @@ abstract class BaseActivity : AppCompatActivity(), NetworkProvider.NetworkListen
     }
 
     fun askToReadTOS() {
-        task {
-            TimeUnit.SECONDS.sleep(5)
-        } successUi {
+        runOnUiThread {
             if (!supportFragmentManager.isDestroyed) {
                 val sheet = TOSSheet.newInstance()
                 sheet.isCancelable = false
diff --git a/app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingActivity.kt b/app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingActivity.kt
index cafb60426..4e086aed2 100644
--- a/app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingActivity.kt
@@ -143,12 +143,6 @@ class OnboardingActivity : BaseActivity() {
                 save(PREFERENCE_INTRO, true)
                 open(SplashActivity::class.java, true)
             }
-            for (fragment in supportFragmentManager.fragments) {
-                if (fragment is PermissionsFragment) {
-                    B.btnForward.isEnabled = fragment.canGoForward()
-                    break
-                }
-            }
         } else {
             B.btnForward.text = getString(R.string.action_next)
             B.btnForward.setOnClickListener {
diff --git a/app/src/main/java/com/aurora/store/view/ui/onboarding/PermissionsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/onboarding/PermissionsFragment.kt
index 7d05bb855..aa80410dc 100644
--- a/app/src/main/java/com/aurora/store/view/ui/onboarding/PermissionsFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/onboarding/PermissionsFragment.kt
@@ -119,15 +119,6 @@ class PermissionsFragment : BaseFragment() {
             ) == PackageManager.PERMISSION_GRANTED else true
             val storageManager = if (isRAndAbove()) Environment.isExternalStorageManager() else true
             val canInstallPackages = if (isOAndAbove()) requireContext().packageManager.canRequestPackageInstalls() else true
-            canGoForward = writeExternalStorage && storageManager && canInstallPackages
-            if (canGoForwardInitial == null) {
-                canGoForwardInitial = canGoForward
-            }
-            if (canGoForward && canGoForwardInitial == false) {
-                if (activity is OnboardingActivity) {
-                    (activity!! as OnboardingActivity).refreshButtonState()
-                }
-            }
             setFilterDuplicates(true)
             installerList.forEach {
                 add(
@@ -212,10 +203,4 @@ class PermissionsFragment : BaseFragment() {
         }
     }
 
-    private var canGoForward = false
-    private var canGoForwardInitial: Boolean? = null
-
-    fun canGoForward(): Boolean {
-        return canGoForward
-    }
 }
\ No newline at end of file