diff --git a/app/src/main/java/org/mozilla/fenix/shortcut/CreateShortcutFragment.kt b/app/src/main/java/org/mozilla/fenix/shortcut/CreateShortcutFragment.kt
index c852b2910..a47f253b3 100644
--- a/app/src/main/java/org/mozilla/fenix/shortcut/CreateShortcutFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/shortcut/CreateShortcutFragment.kt
@@ -10,8 +10,9 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
 import kotlinx.android.synthetic.main.fragment_create_shortcut.*
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.launch
 import org.mozilla.fenix.R
-import org.mozilla.fenix.ext.increaseTapArea
 import org.mozilla.fenix.ext.loadIntoView
 import org.mozilla.fenix.ext.requireComponents
 
@@ -25,10 +26,7 @@ class CreateShortcutFragment : DialogFragment() {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        val view = inflater.inflate(R.layout.fragment_create_shortcut, container, false)
-        return view
-    }
+    ): View? = inflater.inflate(R.layout.fragment_create_shortcut, container, false)
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -36,7 +34,12 @@ class CreateShortcutFragment : DialogFragment() {
         requireComponents.core.icons.loadIntoView(favicon_image, session.url)
         shortcut_text.setText(session.title)
 
-        add_button.increaseTapArea(32)
-        cancel_button.increaseTapArea(32)
+        cancel_button.setOnClickListener { dismiss() }
+        add_button.setOnClickListener {
+            val text = shortcut_text.text.toString()
+            MainScope().launch {
+                requireComponents.useCases.webAppUseCases.addToHomescreen(text)
+            }.invokeOnCompletion { dismiss() }
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/layout/fragment_create_shortcut.xml b/app/src/main/res/layout/fragment_create_shortcut.xml
index 6dacb01ce..0bd01181b 100644
--- a/app/src/main/res/layout/fragment_create_shortcut.xml
+++ b/app/src/main/res/layout/fragment_create_shortcut.xml
@@ -35,6 +35,7 @@
             android:text="@string/add_to_homescreen_title"/>
         <ImageView
             android:id="@+id/favicon_image"
+            android:importantForAccessibility="no"
             android:layout_width="32dp"
             android:layout_height="32dp"
             android:layout_marginTop="32dp"
@@ -42,6 +43,9 @@
             app:layout_constraintStart_toStartOf="parent"/>
         <EditText
             android:id="@+id/shortcut_text"
+            android:inputType="text"
+            android:importantForAutofill="no"
+            android:hint="@string/add_to_homescreen_text_description"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b0a954949..d5b2658da 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -871,4 +871,6 @@
     <string name="add_to_homescreen_cancel">Cancel</string>
     <!-- Add button text for the Add to Homescreen dialog -->
     <string name="add_to_homescreen_add">Add</string>
+    <!-- Content description (not visible, for screen readers etc.): Text field for shortcut name-->
+    <string name="add_to_homescreen_text_description">Shortcut name</string>
 </resources>