diff --git a/app/assets/javascripts/discourse/app/modifiers/auto-focus.js b/app/assets/javascripts/discourse/app/modifiers/auto-focus.js
index e1e75fd721f..1d0f5a3516d 100644
--- a/app/assets/javascripts/discourse/app/modifiers/auto-focus.js
+++ b/app/assets/javascripts/discourse/app/modifiers/auto-focus.js
@@ -3,11 +3,15 @@ import Modifier from "ember-modifier";
 export default class AutoFocusModifier extends Modifier {
   didFocus = false;
 
-  modify(element) {
+  modify(element, _, { selectText }) {
     if (!this.didFocus) {
       element.autofocus = true;
       element.focus();
 
+      if (selectText) {
+        element.select();
+      }
+
       this.didFocus = true;
     }
   }