diff --git a/app/src/main/java/com/vanced/manager/core/fragments/Home.kt b/app/src/main/java/com/vanced/manager/core/fragments/Home.kt
index 8dad0dfa..5e7f16f8 100644
--- a/app/src/main/java/com/vanced/manager/core/fragments/Home.kt
+++ b/app/src/main/java/com/vanced/manager/core/fragments/Home.kt
@@ -65,26 +65,29 @@ open class Home : BaseFragment(), View.OnClickListener {
         when (v?.id) {
             R.id.vanced_installbtn -> {
                 if (!isVancedDownloading!!) {
-                    if (!MiuiHelper.isMiuiOptimisationsDisabled()) {
-                        activity?.let {
-                            secondMiuiDialog(it)
-                        }
-                    }
                     try {
                         activity?.cacheDir?.deleteRecursively()
                     } catch (e: Exception) {
                         Log.d("VMCache", "Unable to delete cacheDir")
                     }
                     if (prefs.getBoolean("valuesModified", false)) {
-                        activity?.startService(
-                            Intent(
-                                activity,
-                                VancedDownloadService::class.java
+                        if (!MiuiHelper.isMiuiOptimisationsDisabled()) {
+                            activity?.let { view?.let { it1 -> secondMiuiDialog(it, it1) } }
+                        } else {
+                            activity?.startService(
+                                Intent(
+                                    activity,
+                                    VancedDownloadService::class.java
+                                )
                             )
-                        )
-                        prefs.edit().putBoolean("isInstalling", false).apply()
-                    } else
-                        view?.findNavController()?.navigate(R.id.toInstallThemeFragment)
+                        }
+                    } else {
+                        if (!MiuiHelper.isMiuiOptimisationsDisabled()) {
+                            activity?.let { view?.let { it1 -> secondMiuiDialog(it, it1) } }
+                        } else
+                            view?.findNavController()?.navigate(R.id.toInstallThemeFragment)
+                    }
+
                 } else {
                     Toast.makeText(
                         activity,
diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt
index e21e8995..8e86d5d5 100644
--- a/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt
+++ b/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt
@@ -4,10 +4,13 @@ import android.app.Activity
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
+import android.view.View
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat.startActivity
+import androidx.navigation.findNavController
 import androidx.preference.PreferenceManager
 import com.vanced.manager.R
+import com.vanced.manager.core.downloader.VancedDownloadService
 import com.vanced.manager.ui.MainActivity
 import com.vanced.manager.utils.InternetTools.openUrl
 import com.vanced.manager.utils.MiuiHelper
@@ -61,11 +64,17 @@ object DialogContainer {
             .show()
     }
 
-    fun secondMiuiDialog(context: Context) {
+    fun secondMiuiDialog(context: Context, view: View) {
         AlertDialog.Builder(context)
             .setTitle(context.getString(R.string.miui_two_title))
             .setMessage(context.getString(R.string.miui_two))
-            .setPositiveButton(context.getString(R.string.button_fine)) { dialog, _ -> dialog.dismiss() }
+            .setPositiveButton(context.getString(R.string.button_fine)) { dialog, _ ->
+                dialog.dismiss()
+                if (context.getSharedPreferences("installPrefs", Context.MODE_PRIVATE).getBoolean("valuesModified", false))
+                    context.startService(Intent(context, VancedDownloadService::class.java))
+                else
+                    view.findNavController().navigate(R.id.toInstallThemeFragment)
+            }
             .setNeutralButton(context.getString(R.string.guide)) { _, _ ->
                 openUrl("https://telegra.ph/How-to-install-v15-on-MIUI-02-11", R.color.Telegram, context)
             }
diff --git a/app/src/main/java/com/vanced/manager/utils/MiuiHelper.kt b/app/src/main/java/com/vanced/manager/utils/MiuiHelper.kt
index 12628fa8..6a57de08 100644
--- a/app/src/main/java/com/vanced/manager/utils/MiuiHelper.kt
+++ b/app/src/main/java/com/vanced/manager/utils/MiuiHelper.kt
@@ -9,7 +9,7 @@ object MiuiHelper {
 
     fun isMiui(): Boolean = !TextUtils.isEmpty(getSystemProps("ro.miui.ui.version.name"))
 
-    fun isMiuiOptimisationsDisabled(): Boolean = getSystemProps("persist.sys.miui_optimization") == "0"
+    fun isMiuiOptimisationsDisabled(): Boolean = isMiui() && getSystemProps("persist.sys.miui_optimization") == "0"
 
     private fun getSystemProps(propname: String): String? {
         val line: String
diff --git a/app/src/main/res/layout/fragment_custom_url.xml b/app/src/main/res/layout/fragment_custom_url.xml
index 247ad172..00b18d97 100644
--- a/app/src/main/res/layout/fragment_custom_url.xml
+++ b/app/src/main/res/layout/fragment_custom_url.xml
@@ -59,8 +59,7 @@
                 android:layout_marginEnd="4dp"
                 android:layout_marginStart="2dp"
                 android:text="@string/save"
-                android:layout_alignParentEnd="true"
-                android:layout_alignStart="@id/url_reset"/>
+                android:layout_alignParentEnd="true" />
 
         </RelativeLayout>