diff --git a/res/layout/accessibility_edit_magnification_mode.xml b/res/layout/accessibility_edit_magnification_mode.xml
index e34f32e51b9..bdc355d2551 100644
--- a/res/layout/accessibility_edit_magnification_mode.xml
+++ b/res/layout/accessibility_edit_magnification_mode.xml
@@ -16,6 +16,7 @@
   -->
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/container_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:scrollbarStyle="outsideOverlay">
@@ -24,8 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingEnd="24dp"
-        android:paddingStart="24dp">
+        android:padding="24dp">
 
         <TextView
             style="@style/AccessibilityDialogDescription"
diff --git a/res/layout/accessibility_edit_shortcut.xml b/res/layout/accessibility_edit_shortcut.xml
index 412ce94329b..53a05f77726 100644
--- a/res/layout/accessibility_edit_shortcut.xml
+++ b/res/layout/accessibility_edit_shortcut.xml
@@ -17,6 +17,7 @@
 
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/container_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:scrollbarStyle="outsideOverlay">
@@ -38,4 +39,4 @@
 
     </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/res/layout/accessibility_edit_shortcut_magnification.xml b/res/layout/accessibility_edit_shortcut_magnification.xml
index 0253edfdaa1..31966e3ce4c 100644
--- a/res/layout/accessibility_edit_shortcut_magnification.xml
+++ b/res/layout/accessibility_edit_shortcut_magnification.xml
@@ -16,6 +16,7 @@
   -->
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/container_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:scrollbarStyle="outsideOverlay">
diff --git a/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java b/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java
index fbe1e7728bb..393058181b2 100644
--- a/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java
+++ b/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java
@@ -29,6 +29,7 @@ import android.view.View;
 import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ScrollView;
 import android.widget.TextView;
 
 import androidx.annotation.ColorInt;
@@ -76,7 +77,7 @@ public class AccessibilityEditDialogUtils {
         final AlertDialog alertDialog = createDialog(context, DialogType.EDIT_SHORTCUT_GENERIC,
                 dialogTitle, listener);
         alertDialog.show();
-
+        setScrollIndicators(alertDialog);
         return alertDialog;
     }
 
@@ -93,7 +94,7 @@ public class AccessibilityEditDialogUtils {
         final AlertDialog alertDialog = createDialog(context,
                 DialogType.EDIT_SHORTCUT_MAGNIFICATION, dialogTitle, listener);
         alertDialog.show();
-
+        setScrollIndicators(alertDialog);
         return alertDialog;
     }
 
@@ -110,7 +111,7 @@ public class AccessibilityEditDialogUtils {
         final AlertDialog alertDialog = createDialog(context,
                 DialogType.EDIT_MAGNIFICATION_MODE, dialogTitle, listener);
         alertDialog.show();
-
+        setScrollIndicators(alertDialog);
         return alertDialog;
     }
 
@@ -128,6 +129,17 @@ public class AccessibilityEditDialogUtils {
         return alertDialog;
     }
 
+    /**
+     * Sets the scroll indicators for dialog view. The indicators appears while content view is
+     * out of vision for vertical scrolling.
+     */
+    private static void setScrollIndicators(AlertDialog dialog) {
+        final ScrollView scrollView = dialog.findViewById(R.id.container_layout);
+        scrollView.setScrollIndicators(
+                View.SCROLL_INDICATOR_TOP | View.SCROLL_INDICATOR_BOTTOM,
+                View.SCROLL_INDICATOR_TOP | View.SCROLL_INDICATOR_BOTTOM);
+    }
+
     /**
      * Get a content View for the edit shortcut dialog.
      *
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index 9bf4cf82e3f..03655a5b67b 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -42,6 +42,7 @@ import android.view.accessibility.AccessibilityManager.TouchExplorationStateChan
 import android.widget.CheckBox;
 import android.widget.ImageView;
 
+import androidx.appcompat.app.AlertDialog;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
@@ -242,7 +243,7 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference
             case DialogEnums.EDIT_SHORTCUT:
                 final CharSequence dialogTitle = getPrefContext().getString(
                         R.string.accessibility_shortcut_title, mPackageName);
-                Dialog dialog = AccessibilityEditDialogUtils.showEditShortcutDialog(
+                final AlertDialog dialog = AccessibilityEditDialogUtils.showEditShortcutDialog(
                         getPrefContext(), dialogTitle, this::callOnAlertDialogCheckboxClicked);
                 initializeDialogCheckBox(dialog);
                 return dialog;