diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerAccentColorDialog.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerAccentColorDialog.kt
index 6d4f705e..a205b491 100644
--- a/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerAccentColorDialog.kt
+++ b/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerAccentColorDialog.kt
@@ -2,6 +2,8 @@ package com.vanced.manager.ui.dialogs
 
 import android.graphics.Color
 import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -14,6 +16,7 @@ import com.vanced.manager.R
 import com.vanced.manager.core.ui.base.BindingDialogFragment
 import com.vanced.manager.databinding.DialogManagerAccentColorBinding
 import com.vanced.manager.utils.Extensions.toHex
+import com.vanced.manager.utils.ThemeHelper.accentColor
 import com.vanced.manager.utils.ThemeHelper.defAccentColor
 import com.vanced.manager.utils.ThemeHelper.mutableAccentColor
 
@@ -41,7 +44,31 @@ class ManagerAccentColorDialog : BindingDialogFragment<DialogManagerAccentColorB
     private fun bindData() {
         with(binding) {
             val accent = prefs.getInt("manager_accent", defAccentColor)
-            hexEdittext.setText(accent.toHex(), TextView.BufferType.EDITABLE)
+            hexEdittext.apply {
+                setText(accent.toHex(), TextView.BufferType.EDITABLE)
+                addTextChangedListener(object : TextWatcher {
+                    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+
+                    override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+                        if (length() == 0) {
+                            setText("#")
+                            setSelection(1)
+
+                        }
+
+                        if (accentColor.value?.toHex() != text.toString() && length() == 7) {
+                            try {
+                                val colorFromEditText = Color.parseColor(text.toString())
+                                accentPicker.setColor(colorFromEditText)
+                                mutableAccentColor.value = colorFromEditText
+                            } catch (e: java.lang.IllegalArgumentException) { }
+                        }
+                    }
+
+                    override fun afterTextChanged(s: Editable?) {}
+
+                })
+            }
             accentPicker.apply {
                 setColor(accent)
                 setColorSelectionListener(object : OnColorSelectionListener {
@@ -50,21 +77,17 @@ class ManagerAccentColorDialog : BindingDialogFragment<DialogManagerAccentColorB
                         hexEdittext.setText(color.toHex(), TextView.BufferType.EDITABLE)
                     }
 
-                    override fun onColorSelectionEnd(color: Int) {
-                        return
-                    }
+                    override fun onColorSelectionEnd(color: Int) {}
 
-                    override fun onColorSelectionStart(color: Int) {
-                        return
-                    }
+                    override fun onColorSelectionStart(color: Int) {}
 
                 })
             }
             accentSave.setOnClickListener {
                 try {
-                    val colorFromEdittext = Color.parseColor(hexEdittext.text.toString())
-                    mutableAccentColor.value = colorFromEdittext
-                    prefs.edit { putInt("manager_accent", colorFromEdittext) }
+                    val colorFromEditText = Color.parseColor(hexEdittext.text.toString())
+                    mutableAccentColor.value = colorFromEditText
+                    prefs.edit { putInt("manager_accent", colorFromEditText) }
                 } catch (e: IllegalArgumentException) {
                     Log.d("VMTheme", getString(R.string.failed_accent))
                     Toast.makeText(requireActivity(), getString(R.string.failed_accent), Toast.LENGTH_SHORT).show()
@@ -73,10 +96,6 @@ class ManagerAccentColorDialog : BindingDialogFragment<DialogManagerAccentColorB
 
                 dismiss()
             }
-            accentSave.setOnClickListener {
-                mutableAccentColor.value = accent
-                dismiss()
-            }
             accentReset.setOnClickListener {
                 prefs.edit { putInt("manager_accent", defAccentColor) }
                 mutableAccentColor.value = defAccentColor
diff --git a/app/src/main/res/layout/dialog_manager_accent_color.xml b/app/src/main/res/layout/dialog_manager_accent_color.xml
index 3ed493dd..84624c13 100644
--- a/app/src/main/res/layout/dialog_manager_accent_color.xml
+++ b/app/src/main/res/layout/dialog_manager_accent_color.xml
@@ -20,7 +20,8 @@
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/hex_edittext"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:maxLength="7"/>
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -33,12 +34,6 @@
                 android:layout_alignParentStart="true"
                 android:text="@string/reset" />
 
-            <com.vanced.manager.ui.core.ThemedOutlinedMaterialButton
-                android:id="@+id/accent_cancel"
-                style="@style/OutlinedButtonStyle"
-                android:layout_alignEnd="@id/accent_save"
-                android:text="@string/cancel" />
-
             <com.vanced.manager.ui.core.ThemedMaterialButton
                 android:id="@+id/accent_save"
                 style="@style/ButtonStyle"